Now I have simplified the stream