add conditional disabling