Started reworking the network