I may just remove the count. It seems like the best option.
That, or I will exclude wacky upgrades like Routine from the count.
