[#32 #33 #34] changes to controller