Rearrange some stuff