minor changes in eval