some changes in network; testing/ debugging