based on comments made on the pull request