improved avatar hand-holding logic