updated answers from pull request