Some rearrangements...