Updated counting, better output