Merged code\network with TSOClient\network