Got rid of the different steps.