Fixed Network

(From git mess)