Some tweaking regarding the network code