Better structure and handling client-side, streaming in progress