Update steps 1 + 2