Added stuff to controller