Changed how PolyLink works