added controller to deactivate the all or nothing logic