Updated Room.java