Modify the eval function