8 Commits (fix/check)