Glenn's and Trevor edits