rearrange, merge push and send clients, separate SR clients