- Made it actually work again with the new style output.