responding to pull request changes round 1