My changes for pull request