added changes per comments in the pull request