Changed to (distance, angle) in data collection