better link handling