Improved performance evaluation code