Better room uploading