More work on links.