evalexpr changes
evalexpr changes