Updated TODO for stream