updated with the comments for the pull request