All changes for step 1 and 2.