Work on better counting