Update step 1 and step 2