use roomname instead re: #7