new super fancy stream and kamil's refactor