Rearrangement of client connection
Merge