Bug fixing networking. Back to original Changes.