Milestone 7 added