Some improve
Fix link function