Danny's edits.