Rework of network code