Switched order for steps 4 and 5