rearrange handlers