some excellent code changes for multiple rooms