updated to address comments on pull request