working on v2 data generator
clean up