Final Edit of Milestone 4