Update to Milestone 4