Added more network code on clinet