improved linking