More changes to the count addition and changes code