updated ExpressionEvaluator