Re facto Controllers