continued work on data generator