Updates to evaluator