Rearrange a bit