switcher now working as advertised