updated to allow for simple room switching