controller modified
controller fixed