Rearrange argument order