Improved linking.