Added stuff to track Controller