added some evaluator stuff