Revamped benchmarks