Updates to step 8