Added Steph's edits