Rearrange for better wrapping