changes for eval