Added omniswitch and Peformance control