Made changes to conform with pull request