Brian's edits continued