Milestone 4 commit