changes with link handling