Update #3

Milestone 5 Changes