Latest modifications to benchmark