milestone 1 code changes for review