starting to change the dataflow implementation