added Milestone 1 and 2