Use map_stream

This is way easier. :+1: