Added John's suggestions for auto count