Updated the evaluation