17 Commits (rewrite)