Fixes to Step 2