added joint_neighbor
finished new neighbor search