some rearrangements according to new plan