Updated my changes for milestone 1, MP