Working on controllers logic