latest changes to eval