Updated for switch.