With proper EOF reporting support. Attached.