added immediate unswitch option