rearrange single behaviour more