fixed friend logic