Changed order of tasks