Completed to step 8 in 2.4