A method for managing communication in a peer-to-peer network in which overlay information is updated on-demand such that neighboring node information is updated at least periodically and other overlay information is updated on-demand (from standard communications). For example, in one aspect, the network includes a plurality of nodes, and the method includes sending a leaving message from a leaving node to the predecessor and successor nodes of the leaving node, the leaving message including information relating to the leaving node, updating each of the predecessor and successor nodes exclusive of any other nodes of the plurality of nodes.