Correction of bugs, still need to check changingTaskOrder