SrmNetworkHandler, reorgnized
small changes