Greg's edits