Updated basic evaluator