another big rearrangement