[UP] rooms + refacto