updated switch