still working on stream issue