implemented changes for the pull request