working on feedback from pull request