Made some Step 2 and other changes