Milestone 4 final changes