Commit after starter milestone 12