updates per discussion on pull request