advanced data generator added, speed only