Commit after starter milestone 24