Updated networking stuff