Applied fixes to Step 2