added DPDT and SPDT switches