- Re-implemented the task engine