some more changes in eval