(Far) more efficient sample generation
Renamed file