Some more bigger changes

This time for counting methods.