Updates for step 3