Fixed up a bit of step 6 and 7