updated generator to use new datapoints
data now stored in its own table