Changed the evaluation