Rearrange combat form a little