Some of Jeff's edits