Improving eval
Merge branch 'utv'