added some lines in controller

merge into existing branch EDST-28