fixing up data collection.