Step 23 and 24