Rearrange for consistency