Added Step 2 functionality