Step 2 and 3 - changed position in flow