Better output and classing