I'd have another look at the switch.