changed room object and added datahandler class