Jeff's edits