Added code for the evaluator