move istep tracking to evaluator