some more rearrangements