added basic visual switching support