Added Flipswitch compatability