More work on the eval tool