Added Operating Mode Control