updates for new evaluator facility