changes from pull request