Modification to where peer looping happens