Reworked to a single queue stream.