Rearrange a little