Made changes based on pull request