better multi-room support