added rejoining of rooms