Reorganize tasks in quals / onsite