My edits to Gayle's revisions before merging with master