Changes to QuickCount code