Step 16 and 17