Changing order of tasks to be more straightforward