change evp update thing. This commit will be removed when rebasing