Revise evaluation more