Rearranged the trace sections.