make change based on the comments from 1st pull request