new template, links updated