Better tool, more links