Added phase shifters
Fixed conflict with SwitchOPA