data generator changed
minor changes