Added some stuff to the controller