"Intelligent" linking added