Milestone 3 commit