refactoring and changing benchmarking procedures