Updated to use Klusark's new format.