Amendment on network part
Some amendments on client part.