Improve the evaluation add