better stream infra-structure