Updates to steps 2 and 3