updated as a result of Client to NetworkPeer refactoring