Added conditional regulation