removed json and changed room object