middle of Steph's edits