improve data collection

Ready to get started?