more work on SwitchVisual