Upgraded links to use tags