Buffer rearrangment