Which things need to be counted that weren't being counted? It's not clear from the code.