Link now appropriately working

Change-Id: Iec0577b1ea20600d3c29033e9c5258939b8cd9ba
Linking

Change-Id: I45f6a47ededf8b7d20b91ead00612abc9305e9b8