A bit more work on evaluation