modified logic, controller