Included steps 0 & 1