Updated for step 1