More changes for pull request