Working on controller and manager