addressing pull request changes