overhaul of benchmarks