changes to eval