more progress on DataFlow