modified Room.java