Final changes for Milestone 1