Code updated through step 5