added network stuff
fixed merge conflict