modified evaluator and added Definition