Synced with latest multiple streams' logic