Added Jeremy's edits