fixed some dependencies (and given control to the controller) :)