8 Commits (fix/clean)