updating switcher with ds confusion