refactoring
replace with own evaluator.