final changes for Milestone 1