Merge in Lennon's edits.