Milestone 6 commit