Re-implemented manual data collection.