Additional changes

Why not keep taskState around?