switcher fix
new quotes