Updated to evaluate expressions.