Updated for pull request