18 Commits (rewrite)