change order of steps and save space