changes from Steph