Changed association, fixing friendships