Improved performance and added time management of evaluation