Merge with Jose
Loading not working on room