More work on task-based system