Improved Linking