better legacy linking