Looks like incremental trace based grading works!