Add Switch to demo