network changes implemented

from testclient