milestone 1 code changes for review
milestone 1 code changes for review