round two of Greg's edits