Reorganizing Traces so that they accurately get captured