Updated Server/Client networking