fixn up the data collection