Changes asked in the pull request