v5.1 and add OmniSwitch back