Some initial rearrangement