Steph's changes
Yay no serious merge conflicts