milestone 2 code changes for review