working on ordering and hideing the stream
fixing