refactoring yay streams