Room: implemented new logic (WIP)