improved benchmarking tool