More minor rearrangements