Updated Milestone 2