Small changes in dataGeneration