changes to linking logic