added omniswitch and omni performance