rearrange matching abit