combined Room.js
merged Room.js issues