Changed order of steps