Benchmark code improved