10 Commits (fix/clean)