working on better data collection