CountSpell improvement