made changes according to response on pull request