added auto linking