revamped all streams to conditional standard