Did some rearrangements