changes suggested by Scott for the pull request