added new switcher FOR REAL NOW