implemented Evaluator, updated Transaction