progress with new dataflow