New algorithm and data + tool tweaks.