rearrange a bit