Completes Step 17 with bugfix