rearrange a little