refractoring and modifications to the linking functions used within the data area