changed data format; leaving the name and id in the data set to make it easier to use