Made improvements to networking