Commit after starter milestone 11