6 Commits (rewrite)