Adding some rearrangement