diff --git a/UD_fr-GSD/morpho/errorCorrection.tm b/UD_fr-GSD/morpho/errorCorrection.tm
index 7af22171d2c4151bffc121cd2dc48e6ef3e21205..475d1d37a323774629f1700e16757a7e85d53871 100644
--- a/UD_fr-GSD/morpho/errorCorrection.tm
+++ b/UD_fr-GSD/morpho/errorCorrection.tm
@@ -1,12 +1,15 @@
 Name : Morpho with error correction
 Dicts : morpho.dicts
 %CLASSIFIERS
+strategy strategy.cla
 morpho morpho.cla
 error_morpho error_morpho.cla
 %STATES
 morpho morpho
+strategy strategy
 error_morpho error_morpho
 %TRANSITIONS
-morpho error_morpho 0 *
-error_morpho morpho 0 BACK
-error_morpho morpho 1 *
+morpho error_morpho *
+error_morpho morpho BACK
+error_morpho strategy *
+strategy morpho *
diff --git a/UD_fr-GSD/morpho/machine.tm b/UD_fr-GSD/morpho/machine.tm
index 7af22171d2c4151bffc121cd2dc48e6ef3e21205..7f48bf73a86cbd9edc87c1ecc4bf008e62f564f1 100644
--- a/UD_fr-GSD/morpho/machine.tm
+++ b/UD_fr-GSD/morpho/machine.tm
@@ -1,12 +1,11 @@
-Name : Morpho with error correction
+Name : Morpho Machine
 Dicts : morpho.dicts
 %CLASSIFIERS
+strategy strategy.cla
 morpho morpho.cla
-error_morpho error_morpho.cla
 %STATES
 morpho morpho
-error_morpho error_morpho
+strategy strategy
 %TRANSITIONS
-morpho error_morpho 0 *
-error_morpho morpho 0 BACK
-error_morpho morpho 1 *
+morpho strategy *
+strategy morpho *
diff --git a/UD_fr-GSD/morpho/morpho.fm b/UD_fr-GSD/morpho/morpho.fm
index f86d4b7ebd60d047f52e14e62952abf51c10e24d..a31ba3f3dc8202698d648ef4af2867294f68753f 100644
--- a/UD_fr-GSD/morpho/morpho.fm
+++ b/UD_fr-GSD/morpho/morpho.fm
@@ -28,11 +28,11 @@ b.0#FORM.PART.1.1
 b.0#FORM.PART.2.2
 b.0#FORM.PART.3.3
 # ERROR CORRECTION
-b.1#POS
-b.1#MORPHO
-b.2#POS
-b.2#MORPHO
-b.3#POS
-b.3#MORPHO
-b.4#POS
-b.4#MORPHO
+#b.1#POS
+#b.1#MORPHO
+#b.2#POS
+#b.2#MORPHO
+#b.3#POS
+#b.3#MORPHO
+#b.4#POS
+#b.4#MORPHO
diff --git a/UD_fr-GSD/morpho/normal.tm b/UD_fr-GSD/morpho/normal.tm
index 530fada046f062d3782971c3eb121d17bfa5e67f..7f48bf73a86cbd9edc87c1ecc4bf008e62f564f1 100644
--- a/UD_fr-GSD/morpho/normal.tm
+++ b/UD_fr-GSD/morpho/normal.tm
@@ -1,8 +1,11 @@
 Name : Morpho Machine
 Dicts : morpho.dicts
 %CLASSIFIERS
+strategy strategy.cla
 morpho morpho.cla
 %STATES
-morpho1 morpho
+morpho morpho
+strategy strategy
 %TRANSITIONS
-morpho1 morpho1 +1 *
+morpho strategy *
+strategy morpho *
diff --git a/UD_fr-GSD/morpho/strategy.cla b/UD_fr-GSD/morpho/strategy.cla
new file mode 100644
index 0000000000000000000000000000000000000000..00e938ff716cac95a492d736c973c42d23d06c8d
--- /dev/null
+++ b/UD_fr-GSD/morpho/strategy.cla
@@ -0,0 +1,4 @@
+Name : Strategy
+Type : Information
+Oracle : strategy_morpho
+Oracle Filename : none
diff --git a/UD_fr-GSD/parser/errorCorrection.tm b/UD_fr-GSD/parser/errorCorrection.tm
index bbdc22d6b32ca5a9a738113f9dddb21abfa458a8..c251e16c3dbfd7f444f80a1b499af7ac34740196 100644
--- a/UD_fr-GSD/parser/errorCorrection.tm
+++ b/UD_fr-GSD/parser/errorCorrection.tm
@@ -1,22 +1,19 @@
-Name : Parser Machine with systematic backtracking
+Name : Parser Machine with predicted backtracking
 Dicts : parser.dicts
 %CLASSIFIERS
+strategy strategy.cla
 signature signature.cla
 parser parser.cla
 error_parser error_parser.cla
 %STATES
+strategy strategy
 signature signature
 parser parser
-error_parser_stay error_parser
-error_parser_move error_parser
+error_parser error_parser
 %TRANSITIONS
-signature parser 0 *
-parser error_parser_stay 0 LEFT
-parser error_parser_stay 0 EOS
-parser error_parser_stay 0 REDUCE
-parser error_parser_stay 0 ROOT
-parser error_parser_move 0 SHIFT
-parser error_parser_move 0 RIGHT
-error_parser_stay parser 0 *
-error_parser_move parser 0 BACK
-error_parser_move signature +1 *
+strategy signature MOVE signature
+strategy parser MOVE parser
+parser error_parser *
+error_parser parser BACK
+error_parser strategy *
+signature strategy *
diff --git a/UD_fr-GSD/parser/error_parser.as b/UD_fr-GSD/parser/error_parser.as
index da0fe77c7d48e5d012be43010e39f644a2577d1e..e9182f3bc4fd349a75722301d1ee825d7de8fe70 100644
--- a/UD_fr-GSD/parser/error_parser.as
+++ b/UD_fr-GSD/parser/error_parser.as
@@ -1 +1,5 @@
-systematic 2
+EPSILON
+BACK 1
+BACK 2
+BACK 3
+BACK 4
diff --git a/UD_fr-GSD/parser/error_parser.cla b/UD_fr-GSD/parser/error_parser.cla
index b7a112d4613dcef20ca6f33300052d2bbf9db185..a8665563f086c0bb4c3fb29717faae9656791560 100644
--- a/UD_fr-GSD/parser/error_parser.cla
+++ b/UD_fr-GSD/parser/error_parser.cla
@@ -1,4 +1,6 @@
 Name : Error_Parser
-Type : Information
-Oracle : error_parser
-Oracle Filename : error_parser.as
+Type : Prediction
+Oracle : none
+Feature Model : error_parser.fm
+Action Set : error_parser.as
+Topology : M(200,RELU,0.3)
diff --git a/UD_fr-GSD/parser_corr/error_parser.fm b/UD_fr-GSD/parser/error_parser.fm
similarity index 100%
rename from UD_fr-GSD/parser_corr/error_parser.fm
rename to UD_fr-GSD/parser/error_parser.fm
diff --git a/UD_fr-GSD/parser/machine.tm b/UD_fr-GSD/parser/machine.tm
index bbdc22d6b32ca5a9a738113f9dddb21abfa458a8..66276c355e7afd860b8f1bd61b34d076d95dc1bb 100644
--- a/UD_fr-GSD/parser/machine.tm
+++ b/UD_fr-GSD/parser/machine.tm
@@ -1,22 +1,15 @@
-Name : Parser Machine with systematic backtracking
+Name : Parser Machine
 Dicts : parser.dicts
 %CLASSIFIERS
+strategy strategy.cla
 signature signature.cla
 parser parser.cla
-error_parser error_parser.cla
 %STATES
+strategy strategy
 signature signature
 parser parser
-error_parser_stay error_parser
-error_parser_move error_parser
 %TRANSITIONS
-signature parser 0 *
-parser error_parser_stay 0 LEFT
-parser error_parser_stay 0 EOS
-parser error_parser_stay 0 REDUCE
-parser error_parser_stay 0 ROOT
-parser error_parser_move 0 SHIFT
-parser error_parser_move 0 RIGHT
-error_parser_stay parser 0 *
-error_parser_move parser 0 BACK
-error_parser_move signature +1 *
+strategy signature MOVE signature
+strategy parser MOVE parser
+parser strategy *
+signature strategy *
diff --git a/UD_fr-GSD/parser/normal.tm b/UD_fr-GSD/parser/normal.tm
index 1de314888a8c4fff1266b927d7fb89322b7b4b17..66276c355e7afd860b8f1bd61b34d076d95dc1bb 100644
--- a/UD_fr-GSD/parser/normal.tm
+++ b/UD_fr-GSD/parser/normal.tm
@@ -1,15 +1,15 @@
 Name : Parser Machine
 Dicts : parser.dicts
 %CLASSIFIERS
+strategy strategy.cla
 signature signature.cla
 parser parser.cla
 %STATES
-sgn1 signature
+strategy strategy
+signature signature
 parser parser
 %TRANSITIONS
-sgn1 parser 0 *
-parser parser 0 LEFT
-parser parser 0 REDUCE
-parser parser 0 EOS
-parser sgn1 +1 SHIFT
-parser sgn1 +1 RIGHT
+strategy signature MOVE signature
+strategy parser MOVE parser
+parser strategy *
+signature strategy *
diff --git a/UD_fr-GSD/parser/parser.cla b/UD_fr-GSD/parser/parser.cla
index 86321ead40e61c9b6ba0f9ac6949916cf29cc796..9291d35b8bf48246bcebeda61c20ec30cab2e017 100644
--- a/UD_fr-GSD/parser/parser.cla
+++ b/UD_fr-GSD/parser/parser.cla
@@ -3,4 +3,4 @@ Type : Prediction
 Oracle : parser
 Feature Model : parser.fm
 Action Set : parser.as
-Topology : (1000,RELU,0.3)
+Topology : (500,RELU,0.3)
diff --git a/UD_fr-GSD/parser/parser.dicts b/UD_fr-GSD/parser/parser.dicts
index 712669aea718ef9ff92b26fd751308cf775f3f4c..e54475a735117d3de3310251705e8e767fe7c73f 100644
--- a/UD_fr-GSD/parser/parser.dicts
+++ b/UD_fr-GSD/parser/parser.dicts
@@ -12,3 +12,16 @@ Parser_letters 30        Embeddings _
 Parser_labels  18        Embeddings _
 Parser_morpho  22        Embeddings _
 Parser_sgn     20        Embeddings _
+########################################################
+Error_Parser_actions 18        Embeddings _
+Error_Parser_bool    16        Embeddings _
+Error_Parser_int     16        Embeddings _
+Error_Parser_eos     16        Embeddings _
+Error_Parser_gov     16        Embeddings _
+Error_Parser_pos     18        Embeddings _
+Error_Parser_form    30        Embeddings _
+Error_Parser_lemma   30        Embeddings _
+Error_Parser_letters 30        Embeddings _
+Error_Parser_labels  18        Embeddings _
+Error_Parser_morpho  22        Embeddings _
+Error_Parser_sgn     20        Embeddings _
diff --git a/UD_fr-GSD/parser/parser.fm b/UD_fr-GSD/parser/parser.fm
index fc30a91d196c33cc3cb6f3c15236012fb62d3ebd..eb6f442e2962428b314b637a940e7b5063ff2b61 100644
--- a/UD_fr-GSD/parser/parser.fm
+++ b/UD_fr-GSD/parser/parser.fm
@@ -98,13 +98,20 @@ tc.2
 tc.3
 tc.4
 # ERROR CORRECTION
-b.1.ldep#LEMMA.fasttext
-b.1.ldep#POS
-b.1.ldep#MORPHO
-b.1.ldep#LABEL
-b.1#LABEL
-b.1.gov#POS
-b.1.gov#MORPHO
+#b.1.ldep#LEMMA.fasttext
+#b.1.ldep#POS
+#b.1.ldep#MORPHO
+#b.1.ldep#LABEL
+#b.1#LABEL
+#b.1.gov#POS
+#b.1.gov#MORPHO
+#b.2.ldep#LEMMA.fasttext
+#b.2.ldep#POS
+#b.2.ldep#MORPHO
+#b.2.ldep#LABEL
+#b.2#LABEL
+#b.2.gov#POS
+#b.2.gov#MORPHO
 # More feats
 b.1#POS
 b.1#MORPHO
diff --git a/UD_fr-GSD/parser/strategy.cla b/UD_fr-GSD/parser/strategy.cla
new file mode 100644
index 0000000000000000000000000000000000000000..29dc2513655274a0dffbddcee2586b72075e10a5
--- /dev/null
+++ b/UD_fr-GSD/parser/strategy.cla
@@ -0,0 +1,4 @@
+Name : Strategy
+Type : Information
+Oracle : strategy_parser
+Oracle Filename : none
diff --git a/UD_fr-GSD/parser_corr/errorCorrection.tm b/UD_fr-GSD/parser_corr/errorCorrection.tm
deleted file mode 100644
index ea639dda1c2e54b2df65a52682f854fd2370b9cf..0000000000000000000000000000000000000000
--- a/UD_fr-GSD/parser_corr/errorCorrection.tm
+++ /dev/null
@@ -1,22 +0,0 @@
-Name : Parser Machine with predicted backtracking
-Dicts : parser.dicts
-%CLASSIFIERS
-signature signature.cla
-parser parser.cla
-error_parser error_parser.cla
-%STATES
-signature signature
-parser parser
-error_parser_stay error_parser
-error_parser_move error_parser
-%TRANSITIONS
-signature parser 0 *
-parser error_parser_stay 0 LEFT
-parser error_parser_stay 0 EOS
-parser error_parser_stay 0 REDUCE
-parser error_parser_stay 0 ROOT
-parser error_parser_move 0 SHIFT
-parser error_parser_move 0 RIGHT
-error_parser_stay parser 0 *
-error_parser_move parser 0 BACK
-error_parser_move signature +1 *
diff --git a/UD_fr-GSD/parser_corr/error_parser.cla b/UD_fr-GSD/parser_corr/error_parser.cla
deleted file mode 100644
index d8b39d8b937fefe181fbaf76022f29d22b690867..0000000000000000000000000000000000000000
--- a/UD_fr-GSD/parser_corr/error_parser.cla
+++ /dev/null
@@ -1,6 +0,0 @@
-Name : Error_Parser
-Type : Prediction
-Oracle : none
-Feature Model : error_parser.fm
-Action Set : error_parser.as
-Topology : (1000,RELU,0.3)
diff --git a/UD_fr-GSD/parser_corr/machine.tm b/UD_fr-GSD/parser_corr/machine.tm
deleted file mode 100644
index ea639dda1c2e54b2df65a52682f854fd2370b9cf..0000000000000000000000000000000000000000
--- a/UD_fr-GSD/parser_corr/machine.tm
+++ /dev/null
@@ -1,22 +0,0 @@
-Name : Parser Machine with predicted backtracking
-Dicts : parser.dicts
-%CLASSIFIERS
-signature signature.cla
-parser parser.cla
-error_parser error_parser.cla
-%STATES
-signature signature
-parser parser
-error_parser_stay error_parser
-error_parser_move error_parser
-%TRANSITIONS
-signature parser 0 *
-parser error_parser_stay 0 LEFT
-parser error_parser_stay 0 EOS
-parser error_parser_stay 0 REDUCE
-parser error_parser_stay 0 ROOT
-parser error_parser_move 0 SHIFT
-parser error_parser_move 0 RIGHT
-error_parser_stay parser 0 *
-error_parser_move parser 0 BACK
-error_parser_move signature +1 *
diff --git a/UD_fr-GSD/parser_corr/normal.tm b/UD_fr-GSD/parser_corr/normal.tm
deleted file mode 100644
index 1de314888a8c4fff1266b927d7fb89322b7b4b17..0000000000000000000000000000000000000000
--- a/UD_fr-GSD/parser_corr/normal.tm
+++ /dev/null
@@ -1,15 +0,0 @@
-Name : Parser Machine
-Dicts : parser.dicts
-%CLASSIFIERS
-signature signature.cla
-parser parser.cla
-%STATES
-sgn1 signature
-parser parser
-%TRANSITIONS
-sgn1 parser 0 *
-parser parser 0 LEFT
-parser parser 0 REDUCE
-parser parser 0 EOS
-parser sgn1 +1 SHIFT
-parser sgn1 +1 RIGHT
diff --git a/UD_fr-GSD/parser_corr/parser.as b/UD_fr-GSD/parser_corr/parser.as
deleted file mode 100644
index ebcc438512e1c2a570c8b29283813110869414d5..0000000000000000000000000000000000000000
--- a/UD_fr-GSD/parser_corr/parser.as
+++ /dev/null
@@ -1,103 +0,0 @@
-Default : SHIFT
-REDUCE
-EOS
-LEFT acl
-LEFT acl:relcl
-LEFT advcl
-LEFT advcl:cleft
-LEFT advmod
-LEFT amod
-LEFT appos
-LEFT aux
-LEFT aux:caus
-LEFT aux:pass
-LEFT case
-LEFT cc
-LEFT ccomp
-LEFT compound
-LEFT conj
-LEFT cop
-LEFT csubj
-LEFT csubj:pass
-LEFT dep
-LEFT det
-LEFT discourse
-LEFT dislocated
-LEFT expl
-LEFT expl:pass
-LEFT fixed
-LEFT flat
-LEFT flat:foreign
-LEFT flat:name
-LEFT goeswith
-LEFT iobj
-LEFT iobj:agent
-LEFT mark
-LEFT nmod
-LEFT nmod:range
-LEFT nsubj
-LEFT nsubj:caus
-LEFT nsubj:pass
-LEFT nummod
-LEFT obj
-LEFT obj:agent
-LEFT obl
-LEFT obl:agent
-LEFT obl:arg
-LEFT obl:mod
-LEFT orphan
-LEFT parataxis
-LEFT punct
-LEFT reparandum
-LEFT vocative
-LEFT xcomp
-RIGHT acl
-RIGHT acl:relcl
-RIGHT advcl
-RIGHT advcl:cleft
-RIGHT advmod
-RIGHT amod
-RIGHT appos
-RIGHT aux
-RIGHT aux:caus
-RIGHT aux:pass
-RIGHT case
-RIGHT cc
-RIGHT ccomp
-RIGHT compound
-RIGHT conj
-RIGHT cop
-RIGHT csubj
-RIGHT csubj:pass
-RIGHT dep
-RIGHT det
-RIGHT discourse
-RIGHT dislocated
-RIGHT expl
-RIGHT expl:pass
-RIGHT fixed
-RIGHT flat
-RIGHT flat:foreign
-RIGHT flat:name
-RIGHT goeswith
-RIGHT iobj
-RIGHT iobj:agent
-RIGHT mark
-RIGHT nmod
-RIGHT nmod:range
-RIGHT nsubj
-RIGHT nsubj:caus
-RIGHT nsubj:pass
-RIGHT nummod
-RIGHT obj
-RIGHT obj:agent
-RIGHT obl
-RIGHT obl:agent
-RIGHT obl:arg
-RIGHT obl:mod
-RIGHT orphan
-RIGHT parataxis
-RIGHT punct
-RIGHT reparandum
-RIGHT vocative
-RIGHT xcomp
diff --git a/UD_fr-GSD/parser_corr/parser.cla b/UD_fr-GSD/parser_corr/parser.cla
deleted file mode 100644
index 86321ead40e61c9b6ba0f9ac6949916cf29cc796..0000000000000000000000000000000000000000
--- a/UD_fr-GSD/parser_corr/parser.cla
+++ /dev/null
@@ -1,6 +0,0 @@
-Name : Parser
-Type : Prediction
-Oracle : parser
-Feature Model : parser.fm
-Action Set : parser.as
-Topology : (1000,RELU,0.3)
diff --git a/UD_fr-GSD/parser_corr/parser.dicts b/UD_fr-GSD/parser_corr/parser.dicts
deleted file mode 100644
index e54475a735117d3de3310251705e8e767fe7c73f..0000000000000000000000000000000000000000
--- a/UD_fr-GSD/parser_corr/parser.dicts
+++ /dev/null
@@ -1,27 +0,0 @@
-#Name          Dimension Mode       PretrainedFilename #
-########################################################
-Parser_actions 18        Embeddings _
-Parser_bool    16        Embeddings _
-Parser_int     16        Embeddings _
-Parser_eos     16        Embeddings _
-Parser_gov     16        Embeddings _
-Parser_pos     18        Embeddings _
-Parser_form    30        Embeddings _
-Parser_lemma   30        Embeddings _
-Parser_letters 30        Embeddings _
-Parser_labels  18        Embeddings _
-Parser_morpho  22        Embeddings _
-Parser_sgn     20        Embeddings _
-########################################################
-Error_Parser_actions 18        Embeddings _
-Error_Parser_bool    16        Embeddings _
-Error_Parser_int     16        Embeddings _
-Error_Parser_eos     16        Embeddings _
-Error_Parser_gov     16        Embeddings _
-Error_Parser_pos     18        Embeddings _
-Error_Parser_form    30        Embeddings _
-Error_Parser_lemma   30        Embeddings _
-Error_Parser_letters 30        Embeddings _
-Error_Parser_labels  18        Embeddings _
-Error_Parser_morpho  22        Embeddings _
-Error_Parser_sgn     20        Embeddings _
diff --git a/UD_fr-GSD/parser_corr/parser.fm b/UD_fr-GSD/parser_corr/parser.fm
deleted file mode 100644
index 8a15a5946d857efbdb4c35ebab24f16c1a9ed90c..0000000000000000000000000000000000000000
--- a/UD_fr-GSD/parser_corr/parser.fm
+++ /dev/null
@@ -1,132 +0,0 @@
-# Features classiques
-# FORM
-s.0#LEMMA.fasttext
-s.1#LEMMA.fasttext
-s.2#LEMMA.fasttext
-s.0.ldep#LEMMA.fasttext
-s.1.ldep#LEMMA.fasttext
-s.0.rdep#LEMMA.fasttext
-s.1.rdep#LEMMA.fasttext
-s.0.ldep.ldep#LEMMA.fasttext
-s.1.ldep.ldep#LEMMA.fasttext
-s.0.rdep.rdep#LEMMA.fasttext
-s.1.rdep.rdep#LEMMA.fasttext
-s.0.l2dep#LEMMA.fasttext
-s.1.l2dep#LEMMA.fasttext
-s.0.r2dep#LEMMA.fasttext
-s.1.r2dep#LEMMA.fasttext
-b.0#LEMMA.fasttext
-b.1#LEMMA.fasttext
-b.2#LEMMA.fasttext
-b.-1#LEMMA.fasttext
-b.-2#LEMMA.fasttext
-b.0.ldep#LEMMA.fasttext
-# POS
-s.0#POS
-s.1#POS
-s.2#POS
-s.0.ldep#POS
-s.1.ldep#POS
-s.0.rdep#POS
-s.1.rdep#POS
-s.0.ldep.ldep#POS
-s.1.ldep.ldep#POS
-s.0.rdep.rdep#POS
-s.1.rdep.rdep#POS
-s.0.l2dep#POS
-s.1.l2dep#POS
-s.0.r2dep#POS
-s.1.r2dep#POS
-b.0#POS
-b.-1#POS
-b.-2#POS
-b.0.ldep#POS
-# MORPHO
-s.0#MORPHO
-s.1#MORPHO
-s.2#MORPHO
-s.0.ldep#MORPHO
-s.1.ldep#MORPHO
-s.0.rdep#MORPHO
-s.1.rdep#MORPHO
-s.0.ldep.ldep#MORPHO
-s.1.ldep.ldep#MORPHO
-s.0.rdep.rdep#MORPHO
-s.1.rdep.rdep#MORPHO
-s.0.l2dep#MORPHO
-s.1.l2dep#MORPHO
-s.0.r2dep#MORPHO
-s.1.r2dep#MORPHO
-b.0#MORPHO
-b.-1#MORPHO
-b.-2#MORPHO
-b.0.ldep#MORPHO
-# LABELS
-s.0.ldep#LABEL
-s.1.ldep#LABEL
-s.0.rdep#LABEL
-s.1.rdep#LABEL
-s.0.ldep.ldep#LABEL
-s.1.ldep.ldep#LABEL
-s.0.rdep.rdep#LABEL
-s.1.rdep.rdep#LABEL
-s.0.l2dep#LABEL
-s.1.l2dep#LABEL
-s.0.r2dep#LABEL
-s.1.r2dep#LABEL
-b.0.ldep#LABEL
-# DISTANCE
-s.0#DIST.s.1
-b.0#DIST.s.0
-# VALENCY
-s.0#nbr
-s.1#nbr
-s.0#nbl
-s.1#nbl
-# SIGNATURES
-b.1#SGN
-b.2#SGN
-# UPPERCASE
-b.0#FORM.U
-b.1#FORM.U
-# EOS
-b.-1#EOS
-# HISTORY
-tc.0
-tc.1
-tc.2
-tc.3
-tc.4
-# ERROR CORRECTION
-b.1.ldep#LEMMA.fasttext
-b.1.ldep#POS
-b.1.ldep#MORPHO
-b.1.ldep#LABEL
-b.1#LABEL
-b.1.gov#POS
-b.1.gov#MORPHO
-b.2.ldep#LEMMA.fasttext
-b.2.ldep#POS
-b.2.ldep#MORPHO
-b.2.ldep#LABEL
-b.2#LABEL
-b.2.gov#POS
-b.2.gov#MORPHO
-# More feats
-b.1#POS
-b.1#MORPHO
-b.2#POS
-b.2#MORPHO
-# More feats
-b.-2#LABEL
-b.-1#LABEL
-b.0#LABEL
-s.0#LABEL
-s.1#LABEL
-# More feats
-b.-1.gov#POS
-b.-1.gov#MORPHO
-s.0.gov#POS
-s.0.gov#MORPHO
-s.1.gov#POS
-s.1.gov#MORPHO
diff --git a/UD_fr-GSD/parser_corr/signature.cla b/UD_fr-GSD/parser_corr/signature.cla
deleted file mode 100644
index d2f6a34440343fd120f01602a58fcfc2c6e351da..0000000000000000000000000000000000000000
--- a/UD_fr-GSD/parser_corr/signature.cla
+++ /dev/null
@@ -1,4 +0,0 @@
-Name : Signature
-Type : Information
-Oracle : signature
-Oracle Filename : ../../data/fP
diff --git a/UD_fr-GSD/parser_corr/test.bd b/UD_fr-GSD/parser_corr/test.bd
deleted file mode 100644
index 40586b63268b1d3fd09b8f6e8fc48554669331b7..0000000000000000000000000000000000000000
--- a/UD_fr-GSD/parser_corr/test.bd
+++ /dev/null
@@ -1,10 +0,0 @@
-#Name  ref/hyp dict    Policy   Must print?#
-############################################
-FORM   ref     form    Final    1
-POS    ref     pos     Final    1
-MORPHO ref     morpho  Final    1
-SGN    hyp     sgn     Final    0
-LEMMA  ref     form   Final    1
-GOV    hyp     gov     Final    1
-LABEL  hyp     labels  Final    1
-EOS    hyp     eos     Final    1
diff --git a/UD_fr-GSD/parser_corr/train.bd b/UD_fr-GSD/parser_corr/train.bd
deleted file mode 100644
index bcfdb46eaa65ae5d642d20ffe623e5b9b4a50141..0000000000000000000000000000000000000000
--- a/UD_fr-GSD/parser_corr/train.bd
+++ /dev/null
@@ -1,10 +0,0 @@
-#Name  ref/hyp dict    Policy   Must print?#
-############################################
-FORM   ref     form    FromZero 1
-POS    ref     pos     FromZero 1
-MORPHO ref     morpho  FromZero 1
-SGN    hyp     sgn     FromZero 1
-LEMMA  ref     form    FromZero 1
-GOV    hyp     gov     FromZero 1
-LABEL  hyp     labels  FromZero 1
-EOS    hyp     eos     FromZero 1
diff --git a/UD_fr-GSD/tagger/errorCorrection.tm b/UD_fr-GSD/tagger/errorCorrection.tm
new file mode 100644
index 0000000000000000000000000000000000000000..6fe73aa9abb0f2636cbb09d0a0806fd192c24967
--- /dev/null
+++ b/UD_fr-GSD/tagger/errorCorrection.tm
@@ -0,0 +1,19 @@
+Name : Tagger with error correction
+Dicts : tagger.dicts
+%CLASSIFIERS
+strategy strategy.cla
+tagger tagger.cla
+signature signature.cla
+error_tagger error_tagger.cla
+%STATES
+strategy strategy
+signature signature
+tagger tagger
+error_tagger.cla
+%TRANSITIONS
+strategy signature MOVE signature
+strategy tagger MOVE tagger
+tagger error_tagger *
+error_tagger tagger BACK
+error_tagger strategy *
+signature strategy *
diff --git a/UD_fr-GSD/parser_corr/error_parser.as b/UD_fr-GSD/tagger/error_tagger.as
similarity index 100%
rename from UD_fr-GSD/parser_corr/error_parser.as
rename to UD_fr-GSD/tagger/error_tagger.as
diff --git a/UD_fr-GSD/tagger/error_tagger.cla b/UD_fr-GSD/tagger/error_tagger.cla
new file mode 100644
index 0000000000000000000000000000000000000000..3cd3f4d43f13f90d506b237ae31c68bd5c6c87e1
--- /dev/null
+++ b/UD_fr-GSD/tagger/error_tagger.cla
@@ -0,0 +1,7 @@
+Name : Error_Tagger
+Type : Prediction
+Oracle : none
+Feature Model : error_tagger.fm
+Action Set : error_tagger.as
+Topology : M(200,RELU,0.3)
+Batchsize : 10
diff --git a/UD_fr-GSD/tagger/error_tagger.fm b/UD_fr-GSD/tagger/error_tagger.fm
new file mode 100644
index 0000000000000000000000000000000000000000..0a130ef4d291b6867de804c4976ccd818a724e67
--- /dev/null
+++ b/UD_fr-GSD/tagger/error_tagger.fm
@@ -0,0 +1,94 @@
+# Features classiques
+# FORM
+b.0#FORM.fasttext
+b.1#FORM.fasttext
+b.2#FORM.fasttext
+b.-1#FORM.fasttext
+b.-2#FORM.fasttext
+# POS
+b.0#POS
+b.-1#POS
+b.-2#POS
+b.-3#POS
+# SIGNATURES
+b.-1#SGN
+b.0#SGN
+#b.1#SGN
+#b.2#SGN
+# UPPERCASE
+b.0#FORM.U
+#b.1#FORM.U
+# UPPERCASE
+b.0#FORM.LEN
+# EOS
+b.-2#EOS
+# SUFFIXES
+b.0#FORM.PART.-4.-4
+b.0#FORM.PART.-3.-3
+b.0#FORM.PART.-2.-2
+b.0#FORM.PART.-1.-1
+b.0#FORM.PART.0.0
+b.0#FORM.PART.1.1
+b.0#FORM.PART.2.2
+b.0#FORM.PART.3.3
+# Features methode incrementale
+#s.0#FORM.fasttext
+#s.1#FORM.fasttext
+#s.2#FORM.fasttext
+#s.0.ldep#FORM.fasttext
+#s.1.ldep#FORM.fasttext
+#s.1.rdep#FORM.fasttext
+#s.0.ldep.ldep#FORM.fasttext
+#s.1.ldep.ldep#FORM.fasttext
+#s.1.rdep.rdep#FORM.fasttext
+#s.0.l2dep#FORM.fasttext
+#s.1.l2dep#FORM.fasttext
+#s.1.r2dep#FORM.fasttext
+#s.0#POS
+#s.1#POS
+#s.2#POS
+#s.0.ldep#POS
+#s.1.ldep#POS
+#s.1.rdep#POS
+#s.0.ldep.ldep#POS
+#s.1.ldep.ldep#POS
+#s.1.rdep.rdep#POS
+#s.0.l2dep#POS
+#s.1.l2dep#POS
+#s.1.r2dep#POS
+#s.0#MORPHO
+#s.1#MORPHO
+#s.2#MORPHO
+#s.0.ldep#MORPHO
+#s.1.ldep#MORPHO
+#s.1.rdep#MORPHO
+#s.0.ldep.ldep#MORPHO
+#s.1.ldep.ldep#MORPHO
+#s.0.l2dep#MORPHO
+#s.1.l2dep#MORPHO
+#s.1.r2dep#MORPHO
+#s.0.ldep#LABEL
+#s.1.ldep#LABEL
+#s.1.rdep#LABEL
+#s.0.ldep.ldep#LABEL
+#s.1.ldep.ldep#LABEL
+#s.1.rdep.rdep#LABEL
+#s.0.l2dep#LABEL
+#s.1.l2dep#LABEL
+#s.1.r2dep#LABEL
+#s.0#DIST.s.1
+#s.1#nbr
+#s.0#nbl
+#s.1#nbl
+#b.-1#MORPHO
+#b.-2#MORPHO
+#b.-2#LABEL
+#b.-1#LABEL
+#s.0#LABEL
+#s.1#LABEL
+#b.-1.gov#POS
+#b.-1.gov#MORPHO
+#s.0.gov#POS
+#s.0.gov#MORPHO
+#s.1.gov#POS
+#s.1.gov#MORPHO
diff --git a/UD_fr-GSD/tagger/machine.tm b/UD_fr-GSD/tagger/machine.tm
index 935453cef1301097f5af8a206eea0b3456c31c00..8d2fd44a553d55c300d2d6a05e2928bec55bf0ca 100644
--- a/UD_fr-GSD/tagger/machine.tm
+++ b/UD_fr-GSD/tagger/machine.tm
@@ -1,11 +1,19 @@
-Name : Tagger Machine
+Name : Tagger with error correction
 Dicts : tagger.dicts
 %CLASSIFIERS
+strategy strategy.cla
 tagger tagger.cla
 signature signature.cla
+error_tagger error_tagger.cla
 %STATES
-signature1 signature
-tagger1 tagger
+strategy strategy
+signature signature
+tagger tagger
+error_tagger error_tagger
 %TRANSITIONS
-signature1 tagger1 0 *
-tagger1 signature1 +1 *
+strategy signature MOVE signature
+strategy tagger MOVE tagger
+tagger error_tagger *
+error_tagger tagger BACK
+error_tagger strategy *
+signature strategy *
diff --git a/UD_fr-GSD/tagger/normal.tm b/UD_fr-GSD/tagger/normal.tm
new file mode 100644
index 0000000000000000000000000000000000000000..d28513e078d7b9f13acd0ebbc9a4136a8b1c2133
--- /dev/null
+++ b/UD_fr-GSD/tagger/normal.tm
@@ -0,0 +1,15 @@
+Name : Tagger Machine
+Dicts : tagger.dicts
+%CLASSIFIERS
+strategy strategy.cla
+tagger tagger.cla
+signature signature.cla
+%STATES
+strategy strategy
+signature signature
+tagger tagger
+%TRANSITIONS
+strategy signature MOVE signature
+strategy tagger MOVE tagger
+tagger strategy *
+signature strategy *
diff --git a/UD_fr-GSD/tagger/strategy.cla b/UD_fr-GSD/tagger/strategy.cla
new file mode 100644
index 0000000000000000000000000000000000000000..12765cd204125534b3d99081d44feeea5ff31078
--- /dev/null
+++ b/UD_fr-GSD/tagger/strategy.cla
@@ -0,0 +1,4 @@
+Name : Strategy
+Type : Information
+Oracle : strategy_tagger
+Oracle Filename : none
diff --git a/UD_fr-GSD/tagger/tagger.cla b/UD_fr-GSD/tagger/tagger.cla
index 12f8435a7a10982b351b3173739034b51a412caa..05a7754ea03f4544bf4a93f8073e1f173d367c8f 100644
--- a/UD_fr-GSD/tagger/tagger.cla
+++ b/UD_fr-GSD/tagger/tagger.cla
@@ -3,4 +3,4 @@ Type : Prediction
 Oracle : tagger
 Feature Model : tagger.fm
 Action Set : tagger.as
-Topology : M(300,RELU,0.3)
+Topology : (500,RELU,0.3)
diff --git a/UD_fr-GSD/tagger/tagger.dicts b/UD_fr-GSD/tagger/tagger.dicts
index d5342183cb656541bc55ba6bfa88d3a833dff9b7..1130185fc416f423a0c1d832d7d820b966f884ee 100644
--- a/UD_fr-GSD/tagger/tagger.dicts
+++ b/UD_fr-GSD/tagger/tagger.dicts
@@ -17,3 +17,12 @@ Tagger_form    30        Embeddings
 Tagger_sgn     10        Embeddings
 Tagger_actions 05        Embeddings
 Tagger_entropy 05        Embeddings
+#########################################################################
+Error_Tagger_bool    02        Embeddings
+Error_Tagger_int     05        Embeddings
+Error_Tagger_letters 30        Embeddings
+Error_Tagger_pos     15        Embeddings
+Error_Tagger_form    30        Embeddings
+Error_Tagger_sgn     10        Embeddings
+Error_Tagger_actions 05        Embeddings
+Error_Tagger_entropy 05        Embeddings
diff --git a/UD_fr-GSD/tagger/tagger.fm b/UD_fr-GSD/tagger/tagger.fm
index 699fb765ef252d9b975ce69dcdf88497e9096fb8..22f91fcf02536fc31b026966ee02a418d9983311 100644
--- a/UD_fr-GSD/tagger/tagger.fm
+++ b/UD_fr-GSD/tagger/tagger.fm
@@ -1,8 +1,8 @@
 # Features classiques
 # FORM
 b.0#FORM.fasttext
-b.1#FORM.fasttext
-b.2#FORM.fasttext
+#b.1#FORM.fasttext
+#b.2#FORM.fasttext
 b.-1#FORM.fasttext
 b.-2#FORM.fasttext
 # POS
@@ -12,13 +12,15 @@ b.-3#POS
 # SIGNATURES
 b.-1#SGN
 b.0#SGN
-b.1#SGN
-b.2#SGN
+#b.1#SGN
+#b.2#SGN
 # UPPERCASE
 b.0#FORM.U
-b.1#FORM.U
+#b.1#FORM.U
 # UPPERCASE
 b.0#FORM.LEN
+# EOS
+b.-2#EOS
 # SUFFIXES
 b.0#FORM.PART.-4.-4
 b.0#FORM.PART.-3.-3
@@ -30,95 +32,6 @@ b.0#FORM.PART.2.2
 b.0#FORM.PART.3.3
 # ERROR CORRECTION
 #b.1#POS
-#b.1.ldep#FORM.fasttext
-#b.1.ldep#POS
-#b.1.ldep#MORPHO
-#b.1.ldep#LABEL
-#b.1#LABEL
-#b.1.gov#POS
-#b.1.gov#MORPHO
 #b.2#POS
-#b.2.ldep#FORM.fasttext
-#b.2.ldep#POS
-#b.2.ldep#MORPHO
-#b.2.ldep#LABEL
-#b.2#LABEL
-#b.2.gov#POS
-#b.2.gov#MORPHO
 #b.3#POS
-#b.3.ldep#FORM.fasttext
-#b.3.ldep#POS
-#b.3.ldep#MORPHO
-#b.3.ldep#LABEL
-#b.3#LABEL
-#b.3.gov#POS
-#b.3.gov#MORPHO
 #b.4#POS
-#b.4.ldep#FORM.fasttext
-#b.4.ldep#POS
-#b.4.ldep#MORPHO
-#b.4.ldep#LABEL
-#b.4#LABEL
-#b.4.gov#POS
-#b.4.gov#MORPHO
-# Features methode incrementale
-#s.0#FORM.fasttext
-#s.1#FORM.fasttext
-#s.2#FORM.fasttext
-#s.0.ldep#FORM.fasttext
-#s.1.ldep#FORM.fasttext
-#s.1.rdep#FORM.fasttext
-#s.0.ldep.ldep#FORM.fasttext
-#s.1.ldep.ldep#FORM.fasttext
-#s.1.rdep.rdep#FORM.fasttext
-#s.0.l2dep#FORM.fasttext
-#s.1.l2dep#FORM.fasttext
-#s.1.r2dep#FORM.fasttext
-#s.0#POS
-#s.1#POS
-#s.2#POS
-#s.0.ldep#POS
-#s.1.ldep#POS
-#s.1.rdep#POS
-#s.0.ldep.ldep#POS
-#s.1.ldep.ldep#POS
-#s.1.rdep.rdep#POS
-#s.0.l2dep#POS
-#s.1.l2dep#POS
-#s.1.r2dep#POS
-#s.0#MORPHO
-#s.1#MORPHO
-#s.2#MORPHO
-#s.0.ldep#MORPHO
-#s.1.ldep#MORPHO
-#s.1.rdep#MORPHO
-#s.0.ldep.ldep#MORPHO
-#s.1.ldep.ldep#MORPHO
-#s.0.l2dep#MORPHO
-#s.1.l2dep#MORPHO
-#s.1.r2dep#MORPHO
-#s.0.ldep#LABEL
-#s.1.ldep#LABEL
-#s.1.rdep#LABEL
-#s.0.ldep.ldep#LABEL
-#s.1.ldep.ldep#LABEL
-#s.1.rdep.rdep#LABEL
-#s.0.l2dep#LABEL
-#s.1.l2dep#LABEL
-#s.1.r2dep#LABEL
-#s.0#DIST.s.1
-#s.1#nbr
-#s.0#nbl
-#s.1#nbl
-#b.-1#MORPHO
-#b.-2#MORPHO
-#b.-2#LABEL
-#b.-1#LABEL
-#s.0#LABEL
-#s.1#LABEL
-#b.-1.gov#POS
-#b.-1.gov#MORPHO
-#s.0.gov#POS
-#s.0.gov#MORPHO
-#s.1.gov#POS
-#s.1.gov#MORPHO