Change code according to the pull request