changes for new evaluation