updated for pull request comments