Checkout step 3 changes and others