added support for rev1_switch & rev2_switch