rewriting dataGenerator