yet more rearrangement