refactored rooms