updated to use the new linked fields function