some changes in network module logic