holoirc: rearrange again