better linking
fix linking