Buffering of data seems to work now