Added update rooms
Fixed merged