Added Tristan's Edits