My changes to NetworkManager