Modernize return link