modified stuff, added network manager