updated to use TxSwitch