changes to allow evaluation