1.c improved
switcher updated: save prev as back
2.c reduced