ENH:change evaluation stage