Step 2 modifications