improved link-creation