Revisiting async streams

Revisiting code on async streams.