re-ordered some tasks