Task controller modified