Rearrange to match original