A method of arranging a plurality of peers at distribution levels in a P2P network with respect to a streaming source, the method comprising: arranging at least one peer of the plurality of peers having a highest upload capacity at the distribution level closest to the streaming source; arranging remaining peers of the plurality of peers at subsequent distribution levels in order of descending upload capacity, such that each peer has an upload capacity that does not exceed the upload capacity of any peer at an immediately preceding level, the peers further being arranged such that the total upload capacity of the peers at any distribution level is equal to or exceeds total download demand of the peers at an immediately subsequent level, and if a predetermined maximal allowed number of distribution levels has been exceeded; the method being characterized in comprising: moving at least one of the peers having a next-highest upload capacity to the distribution level closest to the streaming source and connecting a plurality of peers from subsequent levels to said at least one of the peers having a next-highest upload capacity such that the next-highest upload capacity is fully utilized; and further re-arranging at least one selected peer arranged at a level subsequent to that closest to the streaming source and connecting the at least one selected peer to said at least one peer having the highest upload capacity such that the highest upload capacity is fully utilized, until the predetermined maximum number of distribution levels no longer is exceeded. arranging at least one peer of the plurality of peers having a highest upload capacity at the distribution level closest to the streaming source; arranging remaining peers of the plurality of peers at subsequent distribution levels in order of descending upload capacity, such that each peer has an upload capacity that does not exceed the upload capacity of any peer at an immediately preceding level, the peers further being arranged such that the total upload capacity of the peers at any distribution level is equal to or exceeds total download demand of the peers at an immediately subsequent level, and if a predetermined maximal allowed number of distribution levels has been exceeded; the method being characterized in comprising: moving at least one of the peers having a next-highest upload capacity to the distribution level closest to the streaming source and connecting a plurality of peers from subsequent levels to said at least one of the peers having a next-highest upload capacity such that the next-highest upload capacity is fully utilized; and further re-arranging at least one selected peer arranged at a level subsequent to that closest to the streaming source and connecting the at least one selected peer to said at least one peer having the highest upload capacity such that the highest upload capacity is fully utilized, until the predetermined maximum number of distribution levels no longer is exceeded. moving at least one of the peers having a next-highest upload capacity to the distribution level closest to the streaming source and connecting a plurality of peers from subsequent levels to said at least one of the peers having a next-highest upload capacity such that the next-highest upload capacity is fully utilized; and further re-arranging at least one selected peer arranged at a level subsequent to that closest to the streaming source and connecting the at least one selected peer to said at least one peer having the highest upload capacity such that the highest upload capacity is fully utilized, until the predetermined maximum number of distribution levels no longer is exceeded.