Updates to steps 1-2