updated to full data set