Add omniswitch back in