Made modifications according to comments for the PR
Merge branch 'hackathon_Justin_7_17' into hackathon_Justin