new networking code
fixed conflicts