Changes from pull request