Update Evaluator.cpp