New version of network and change to output