Revised RoomService