updated with pull request comments