added switch-window