Fix step 1 and 2
Update