Fixed Steph's unecessary changes