Update to Milestone 1