Additional changes

Ah, since we have task, we have task state.