SAT-1075 some modification in controller