Moved the count into a define