Index: compile_rules.py
==================================================================
--- compile_rules.py
+++ compile_rules.py
@@ -54,11 +54,11 @@
     s = re.sub(r"after0_chk1\(\s*", 'look_chk1(dDA, sx[m.end():], m.end(), ', s)            # after0_chk1(s)
     s = re.sub(r"textarea0_chk1\(\s*", 'look_chk1(dDA, sx, 0, ', s)                         # textarea0_chk1(s)
     s = re.sub(r"isEndOfNG\(\s*\)", 'isEndOfNG(dDA, s[m.end():], m.end())', s)              # isEndOfNG(s)
     s = re.sub(r"isNextNotCOD\(\s*\)", 'isNextNotCOD(dDA, s[m.end():], m.end())', s)        # isNextNotCOD(s)
     s = re.sub(r"isNextVerb\(\s*\)", 'isNextVerb(dDA, s[m.end():], m.end())', s)            # isNextVerb(s)
-    s = re.sub(r"\bspell *[(]", '_oDict.isValid(', s)
+    s = re.sub(r"\bspell *[(]", '_oSpellChecker.isValid(', s)
     s = re.sub(r"[\\](\d+)", 'm.group(\\1)', s)
     return s
 
 
 def uppercase (s, sLang):

Index: gc_core/js/lang_core/gc_engine.js
==================================================================
--- gc_core/js/lang_core/gc_engine.js
+++ gc_core/js/lang_core/gc_engine.js
@@ -36,11 +36,10 @@
 
 // data
 let _sAppContext = "";                                  // what software is running
 let _dOptions = null;
 let _aIgnoredRules = new Set();
-let _oDict = null;
 let _oSpellChecker = null;
 let _dAnalyses = new Map();                             // cache for data from dictionary
 
 
 var gc_engine = {
@@ -321,19 +320,14 @@
     //// Initialization
 
     load: function (sContext="JavaScript", sPath="") {
         try {
             if (typeof(require) !== 'undefined') {
-                //var ibdawg = require("resource://grammalecte/graphspell/ibdawg.js");
-                //_oDict = new ibdawg.IBDAWG("${dic_filename}.json");
-                console.log("<resource:>");
                 var spellchecker = require("resource://grammalecte/graphspell/spellchecker.js");
-                _oSpellChecker = new spellchecker.Spellchecker("${lang}", "${dic_filename}.json");
+                _oSpellChecker = new spellchecker.SpellChecker("${lang}", "", "${dic_filename}.json");
             } else {
-                //_oDict = new IBDAWG("${dic_filename}.json", sPath);
-                console.log("no <resource:>");
-                _oSpellChecker = new Spellchecker("${lang}", "${dic_filename}.json", sPath);
+                _oSpellChecker = new SpellChecker("${lang}", sPath, "${dic_filename}.json");
             }
             _sAppContext = sContext;
             _dOptions = gc_options.getOptions(sContext).gl_shallowCopy();     // duplication necessary, to be able to reset to default
         }
         catch (e) {

Index: gc_core/py/lang_core/gc_engine.py
==================================================================
--- gc_core/py/lang_core/gc_engine.py
+++ gc_core/py/lang_core/gc_engine.py
@@ -6,11 +6,11 @@
 import os
 import traceback
 #import unicodedata
 from itertools import chain
 
-from ..graphspell.ibdawg import IBDAWG
+from ..graphspell.spellchecker import SpellChecker
 from ..graphspell.echo import echo
 from . import gc_options
 
 
 __all__ = [ "lang", "locales", "pkg", "name", "version", "author", \
@@ -32,11 +32,11 @@
 
 # data
 _sAppContext = ""                           # what software is running
 _dOptions = None
 _aIgnoredRules = set()
-_oDict = None
+_oSpellChecker = None
 _dAnalyses = {}                             # cache for data from dictionary
 
 
 
 #### Parsing
@@ -286,15 +286,15 @@
 except ImportError:
     _createError = _createDictError
 
 
 def load (sContext="Python"):
-    global _oDict
+    global _oSpellChecker
     global _sAppContext
     global _dOptions
     try:
-        _oDict = IBDAWG("${dic_filename}.bdic")
+        _oSpellChecker = SpellChecker("${lang}", "${dic_filename}.bdic")
         _sAppContext = sContext
         _dOptions = dict(gc_options.getOptions(sContext))   # duplication necessary, to be able to reset to default
     except:
         traceback.print_exc()
 
@@ -332,11 +332,11 @@
     global _dOptions
     _dOptions = dict(gc_options.getOptions(_sAppContext))
 
 
 def getDictionary ():
-    return _oDict
+    return _oSpellChecker
 
 
 def _getRules (bParagraph):
     try:
         if not bParagraph:
@@ -396,13 +396,13 @@
     echo("FSA: " + str(_dAnalyses[tWord[1]]))
     return True
 
 
 def _storeMorphFromFSA (sWord):
-    "retrieves morphologies list from _oDict -> _dAnalyses"
+    "retrieves morphologies list from _oSpellChecker -> _dAnalyses"
     global _dAnalyses
-    _dAnalyses[sWord] = _oDict.getMorph(sWord)
+    _dAnalyses[sWord] = _oSpellChecker.getMorph(sWord)
     return True  if _dAnalyses[sWord]  else False
 
 
 def morph (dDA, tWord, sPattern, bStrict=True, bNoWord=False):
     "analyse a tuple (position, word), return True if sPattern in morphologies (disambiguation on)"

Index: gc_lang/fr/modules-js/gce_suggestions.js
==================================================================
--- gc_lang/fr/modules-js/gce_suggestions.js
+++ gc_lang/fr/modules-js/gce_suggestions.js
@@ -208,21 +208,21 @@
         }
     }
     let aSugg = new Set();
     if (!sFlex.includes("-")) {
         if (sFlex.endsWith("l")) {
-            if (sFlex.endsWith("al") && sFlex.length > 2 && _oDict.isValid(sFlex.slice(0,-1)+"ux")) {
+            if (sFlex.endsWith("al") && sFlex.length > 2 && _oSpellChecker.isValid(sFlex.slice(0,-1)+"ux")) {
                 aSugg.add(sFlex.slice(0,-1)+"ux");
             }
-            if (sFlex.endsWith("ail") && sFlex.length > 3 && _oDict.isValid(sFlex.slice(0,-2)+"ux")) {
+            if (sFlex.endsWith("ail") && sFlex.length > 3 && _oSpellChecker.isValid(sFlex.slice(0,-2)+"ux")) {
                 aSugg.add(sFlex.slice(0,-2)+"ux");
             }
         }
-        if (_oDict.isValid(sFlex+"s")) {
+        if (_oSpellChecker.isValid(sFlex+"s")) {
             aSugg.add(sFlex+"s");
         }
-        if (_oDict.isValid(sFlex+"x")) {
+        if (_oSpellChecker.isValid(sFlex+"x")) {
             aSugg.add(sFlex+"x");
         }
     }
     if (mfsp.hasMiscPlural(sFlex)) {
         mfsp.getMiscPlural(sFlex).forEach(function(x) { aSugg.add(x); });
@@ -238,18 +238,18 @@
     if (sFlex.includes("-")) {
         return "";
     }
     let aSugg = new Set();
     if (sFlex.endsWith("ux")) {
-        if (_oDict.isValid(sFlex.slice(0,-2)+"l")) {
+        if (_oSpellChecker.isValid(sFlex.slice(0,-2)+"l")) {
             aSugg.add(sFlex.slice(0,-2)+"l");
         }
-        if (_oDict.isValid(sFlex.slice(0,-2)+"il")) {
+        if (_oSpellChecker.isValid(sFlex.slice(0,-2)+"il")) {
             aSugg.add(sFlex.slice(0,-2)+"il");
         }
     }
-    if (_oDict.isValid(sFlex.slice(0,-1))) {
+    if (_oSpellChecker.isValid(sFlex.slice(0,-1))) {
         aSugg.add(sFlex.slice(0,-1));
     }
     if (aSugg.size > 0) {
         return Array.from(aSugg).join("|");
     }

Index: gc_lang/fr/modules/gce_suggestions.py
==================================================================
--- gc_lang/fr/modules/gce_suggestions.py
+++ gc_lang/fr/modules/gce_suggestions.py
@@ -157,17 +157,17 @@
         elif sGender == ":f":
             return suggFemPlur(sFlex)
     aSugg = set()
     if "-" not in sFlex:
         if sFlex.endswith("l"):
-            if sFlex.endswith("al") and len(sFlex) > 2 and _oDict.isValid(sFlex[:-1]+"ux"):
+            if sFlex.endswith("al") and len(sFlex) > 2 and _oSpellChecker.isValid(sFlex[:-1]+"ux"):
                 aSugg.add(sFlex[:-1]+"ux")
-            if sFlex.endswith("ail") and len(sFlex) > 3 and _oDict.isValid(sFlex[:-2]+"ux"):
+            if sFlex.endswith("ail") and len(sFlex) > 3 and _oSpellChecker.isValid(sFlex[:-2]+"ux"):
                 aSugg.add(sFlex[:-2]+"ux")
-        if _oDict.isValid(sFlex+"s"):
+        if _oSpellChecker.isValid(sFlex+"s"):
             aSugg.add(sFlex+"s")
-        if _oDict.isValid(sFlex+"x"):
+        if _oSpellChecker.isValid(sFlex+"x"):
             aSugg.add(sFlex+"x")
     if mfsp.hasMiscPlural(sFlex):
         aSugg.update(mfsp.getMiscPlural(sFlex))
     if aSugg:
         return "|".join(aSugg)
@@ -178,15 +178,15 @@
     "returns singular forms assuming sFlex is plural"
     if "-" in sFlex:
         return ""
     aSugg = set()
     if sFlex.endswith("ux"):
-        if _oDict.isValid(sFlex[:-2]+"l"):
+        if _oSpellChecker.isValid(sFlex[:-2]+"l"):
             aSugg.add(sFlex[:-2]+"l")
-        if _oDict.isValid(sFlex[:-2]+"il"):
+        if _oSpellChecker.isValid(sFlex[:-2]+"il"):
             aSugg.add(sFlex[:-2]+"il")
-    if _oDict.isValid(sFlex[:-1]):
+    if _oSpellChecker.isValid(sFlex[:-1]):
         aSugg.add(sFlex[:-1])
     if aSugg:
         return "|".join(aSugg)
     return ""