Step 5 and 6 of tutorial