Updated to use new data set