Better task list in build

;