switch branch if not disabled
add disabled check