mostly finished rearrangement management