Committing changes for merging with Jon's pull request