rearrange definitions