Re-rearrange somethings.