Won't this get_peer method now get called every time? Maybe an if is a better solution.