v6

improve data generator