MileStone 1 changes