switch to better usage of streams with event-stream