re-ordering of tasks for #31