added switch room