add new switcher
remove old switcher