Better peer readding implementation