Benchmarks reworked