rebuilding a more disciplined evaluator