Rearrange params