diff --git a/UD_any/morpho/machine.rm b/UD_any/morpho/machine.rm
index eeaeaa5fe3fdb4ed2235fff8a492e1b45c3f2e60..554d1136acb7240e8ad8eda243890158a44500ba 100644
--- a/UD_any/morpho/machine.rm
+++ b/UD_any/morpho/machine.rm
@@ -1,38 +1,24 @@
 Name : Feats Machine
 Classifier : morpho
 {
-  Transitions :             {morpho,data/morpho_parts.ts}
-  Network type :            LSTM
-  Unknown value threshold : 1
-  Buffer context :          {-3 -2 -1 0 1 2}
-  Stack context :           {}
-  Columns :                 {FORM UPOS}
-  Focused buffer :          {-1 0}
-  Focused stack :           {}
-  Focused columns :         {ID FORM FEATS}
-  Max nb elements :         {1 10 10}
-  Raw input left window :   -1
-  Raw input right window :  -1
-  Embeddings size :         128
-  MLP :                     {2048 0.3}
-  Context LSTM size :       512
-  Focused LSTM size :       256
-  Rawinput LSTM size :      32
-  Split trans LSTM size :   256
-  Num layers :              3
-  BiLSTM :                  true
-  LSTM dropout :            0.1
-  Total input dropout :     0.3
-  Embeddings dropout :      0.3
-  Dropout 2d :              false
-  Tree embedding columns :  {}
-  Tree embedding buffer :   {}
-  Tree embedding stack :    {}
-  Tree embedding nb :       {}
-  Tree embedding size :     0
-  Optimizer :               Adam {0.0005 0.9 0.999 0.00000001 0.00001 true}
+	Transitions : {morpho,data/morpho_parts.ts}
+	LossMultiplier : {}
+	Network type : Modular
+	Context : Buffer{-3 -2 -1 0 1 2} Stack{} Columns{FORM UPOS} LSTM{1 1 0 1} In{64} Out{64}
+	Focused : Column{ID} NbElem{1} Buffer{-1 0 1 2} Stack{} LSTM{1 1 0 1} In{64} Out{64}
+	Focused : Column{FORM} NbElem{13} Buffer{-1 0 1 2} Stack{} LSTM{1 1 0 1} In{64} Out{64}
+	Focused : Column{FEATS} NbElem{13} Buffer{-1 0} Stack{} LSTM{1 1 0 1} In{64} Out{64}
+	Focused : Column{EOS} NbElem{1} Buffer{-1} Stack{} LSTM{1 1 0 1} In{64} Out{64}
+	History : NbElem{10} LSTM{1 1 0 1} In{64} Out{64}
+	InputDropout : 0.5
+	MLP : {2048 0.3 2048 0.3}
+	End
+	Optimizer : Adam {0.0002 0.9 0.999 0.00000001 0.00001 true}
 }
 Predictions : FEATS
-Strategy : sequential
-  morpho morpho NOTHING 1
-  morpho morpho 0
+Strategy
+{
+	Block : End{cannotMove}
+	morpho morpho NOTHING 1
+	morpho morpho * 0
+}
diff --git a/UD_any/taggerparser_base/machine.rm b/UD_any/taggerparser_base/machine.rm
index 136bea24b3872a9c916f8722cd15102d11e611f4..628b9c9caf2c4398111cd88b1729261519432c42 100644
--- a/UD_any/taggerparser_base/machine.rm
+++ b/UD_any/taggerparser_base/machine.rm
@@ -4,7 +4,6 @@ Classifier : tagparser
 	Transitions : {tagger,data/tagger.ts parser,data/parser_eager_rel_strict.ts segmenter,data/segmenter.ts}
 	LossMultiplier : {segmenter,10.0}
 	Network type : Modular
-#	AppliableTrans :  
 	StateName : Out{64}
 	Context : Buffer{-3 -2 -1 0 1 2} Stack{} Columns{FORM} LSTM{1 1 0 1} In{64} Out{64}
 	Context : Buffer{-3 -2 -1 0} Stack{1 0} Columns{UPOS} LSTM{1 1 0 1} In{64} Out{64}
@@ -13,6 +12,7 @@ Classifier : tagparser
 	Focused : Column{EOS} NbElem{1} Buffer{-1} Stack{} LSTM{1 1 0 1} In{64} Out{64}
 	Focused : Column{DEPREL} NbElem{1} Buffer{} Stack{2 1 0} LSTM{1 1 0 1} In{64} Out{64}
 	DepthLayerTree : Columns{DEPREL} Buffer{} Stack{2 1 0} LayerSizes{3} LSTM{1 1 0.0 1} In{64} Out{64}
+	History : NbElem{10} LSTM{1 1 0 1} In{64} Out{64}
 	InputDropout : 0.5
 	MLP : {2048 0.3 2048 0.3}
 	End
@@ -24,7 +24,7 @@ Strategy
 	Block : End{cannotMove}
 	tagger tagger * 1
 	Block : End{cannotMove}
-	parser segmenter SHIFT 0
+	parser segmenter eager_SHIFT 0
 	parser segmenter eager_RIGHT_rel 0
 	parser parser * 0
 	segmenter parser * 1
diff --git a/UD_any/taggerparser_incr/machine.rm b/UD_any/taggerparser_incr/machine.rm
index f56b219c8aa44b3d50bdef16512f05b9e5cb18a7..27a286bf2bbd3d119270b90cd9c800f8f6749163 100644
--- a/UD_any/taggerparser_incr/machine.rm
+++ b/UD_any/taggerparser_incr/machine.rm
@@ -4,7 +4,6 @@ Classifier : taggerparser
 	Transitions : {tagger,data/tagger.ts parser,data/parser_eager_rel_strict.ts segmenter,data/segmenter.ts}
 	LossMultiplier : {segmenter,10.0}
 	Network type : Modular
-#	AppliableTrans :  
 	StateName : Out{64}
 	Context : Buffer{-3 -2 -1 0 1 2} Stack{} Columns{FORM} LSTM{1 1 0 1} In{64} Out{64}
 	Context : Buffer{-3 -2 -1 0} Stack{1 0} Columns{UPOS} LSTM{1 1 0 1} In{64} Out{64}
@@ -13,6 +12,7 @@ Classifier : taggerparser
 	Focused : Column{EOS} NbElem{1} Buffer{-1} Stack{} LSTM{1 1 0 1} In{64} Out{64}
 	Focused : Column{DEPREL} NbElem{1} Buffer{} Stack{2 1 0} LSTM{1 1 0 1} In{64} Out{64}
 	DepthLayerTree : Columns{DEPREL} Buffer{} Stack{2 1 0} LayerSizes{3} LSTM{1 1 0.0 1} In{64} Out{64}
+	History : NbElem{10} LSTM{1 1 0 1} In{64} Out{64}
 	InputDropout : 0.5
 	MLP : {2048 0.3 2048 0.3}
 	End
@@ -23,7 +23,7 @@ Strategy
 {
 	Block : End{cannotMove}
 	tagger parser * 0
-	parser segmenter SHIFT 0
+	parser segmenter eager_SHIFT 0
 	parser segmenter eager_RIGHT_rel 0
 	parser parser * 0
 	segmenter tagger * 1
diff --git a/UD_any/taggerparser_seq/machine.rm b/UD_any/taggerparser_seq/machine.rm
index 409f1010d318cc490f84c5e33a0b50f5812f780d..ccc6799491ec1b696b876d3d02e0b97410d0f58b 100644
--- a/UD_any/taggerparser_seq/machine.rm
+++ b/UD_any/taggerparser_seq/machine.rm
@@ -4,7 +4,6 @@ Classifier : tagparser
 	Transitions : {tagger,data/tagger.ts parser,data/parser_eager_rel_strict.ts segmenter,data/segmenter.ts}
 	LossMultiplier : {segmenter,10.0}
 	Network type : Modular
-#	AppliableTrans :  
 	StateName : Out{64}
 	Context : Buffer{-3 -2 -1 0 1 2} Stack{} Columns{FORM} LSTM{1 1 0 1} In{64} Out{64}
 	Context : Buffer{-3 -2 -1 0 1 2} Stack{1 0} Columns{UPOS} LSTM{1 1 0 1} In{64} Out{64}
@@ -13,6 +12,7 @@ Classifier : tagparser
 	Focused : Column{EOS} NbElem{1} Buffer{-1} Stack{} LSTM{1 1 0 1} In{64} Out{64}
 	Focused : Column{DEPREL} NbElem{1} Buffer{} Stack{2 1 0} LSTM{1 1 0 1} In{64} Out{64}
 	DepthLayerTree : Columns{DEPREL} Buffer{} Stack{2 1 0} LayerSizes{3} LSTM{1 1 0.0 1} In{64} Out{64}
+	History : NbElem{10} LSTM{1 1 0 1} In{64} Out{64}
 	InputDropout : 0.5
 	MLP : {2048 0.3 2048 0.3}
 	End
@@ -24,7 +24,7 @@ Strategy
 	Block : End{cannotMove}
 	tagger tagger * 1
 	Block : End{cannotMove}
-	parser segmenter SHIFT 0
+	parser segmenter eager_SHIFT 0
 	parser segmenter eager_RIGHT_rel 0
 	parser parser * 0
 	segmenter parser * 1
diff --git a/UD_any/tagparser_base/machine.rm b/UD_any/tagparser_base/machine.rm
index 24b4d3148f7c5b7c9dcb4ff01ad2cac27aa98ca2..59a09d1a709ea4fe9b3f259d915e4e4d508d1a8d 100644
--- a/UD_any/tagparser_base/machine.rm
+++ b/UD_any/tagparser_base/machine.rm
@@ -1,10 +1,9 @@
 Name : Tagger, Feats , Parser and Segmenter baseline Machine
 Classifier : tagparser
 {
-	Transitions : {tagger,data/tagger.ts morpho,data/morpho_parts.ts parser,data/parser.ts segmenter,data/segmenter.ts}
+	Transitions : {tagger,data/tagger.ts morpho,data/morpho_parts.ts parser,data/parser_eager_rel_strict.ts segmenter,data/segmenter.ts}
 	LossMultiplier : {segmenter,10.0}
 	Network type : Modular
-#	AppliableTrans :  
 	StateName : Out{64}
 	Context : Buffer{-3 -2 -1 0 1 2} Stack{} Columns{FORM} LSTM{1 1 0 1} In{64} Out{64}
 	Context : Buffer{-3 -2 -1 0} Stack{1 0} Columns{UPOS} LSTM{1 1 0 1} In{64} Out{64}
@@ -14,6 +13,7 @@ Classifier : tagparser
 	Focused : Column{EOS} NbElem{1} Buffer{-1} Stack{} LSTM{1 1 0 1} In{64} Out{64}
 	Focused : Column{DEPREL} NbElem{1} Buffer{} Stack{2 1 0} LSTM{1 1 0 1} In{64} Out{64}
 	DepthLayerTree : Columns{DEPREL} Buffer{} Stack{2 1 0} LayerSizes{3} LSTM{1 1 0.0 1} In{64} Out{64}
+	History : NbElem{10} LSTM{1 1 0 1} In{64} Out{64}
 	InputDropout : 0.5
 	MLP : {2048 0.3 2048 0.3}
 	End
@@ -28,8 +28,8 @@ Strategy
 	morpho morpho NOTHING 1
 	morpho morpho * 0
 	Block : End{cannotMove}
-	parser segmenter SHIFT 0
-	parser segmenter RIGHT 0
+	parser segmenter eager_SHIFT 0
+	parser segmenter eager_RIGHT_rel 0
 	parser parser * 0
 	segmenter parser * 1
 }
diff --git a/UD_any/tagparser_incr/machine.rm b/UD_any/tagparser_incr/machine.rm
index 6a2323d0bd709334949961b72b57747c79416138..f6ad83fc2a2c9a318a53d80dbe4cf0f2f56900ce 100644
--- a/UD_any/tagparser_incr/machine.rm
+++ b/UD_any/tagparser_incr/machine.rm
@@ -1,10 +1,9 @@
 Name : Tagger, Feats , Parser and Segmenter incremental Machine
 Classifier : tagparser
 {
-	Transitions : {tagger,data/tagger.ts morpho,data/morpho_parts.ts parser,data/parser.ts segmenter,data/segmenter.ts}
+	Transitions : {tagger,data/tagger.ts morpho,data/morpho_parts.ts parser,data/parser_eager_rel_strict.ts segmenter,data/segmenter.ts}
 	LossMultiplier : {segmenter,10.0}
 	Network type : Modular
-#	AppliableTrans :  
 	StateName : Out{64}
 	Context : Buffer{-3 -2 -1 0 1 2} Stack{} Columns{FORM} LSTM{1 1 0 1} In{64} Out{64}
 	Context : Buffer{-3 -2 -1 0} Stack{1 0} Columns{UPOS} LSTM{1 1 0 1} In{64} Out{64}
@@ -14,6 +13,7 @@ Classifier : tagparser
 	Focused : Column{EOS} NbElem{1} Buffer{-1} Stack{} LSTM{1 1 0 1} In{64} Out{64}
 	Focused : Column{DEPREL} NbElem{1} Buffer{} Stack{2 1 0} LSTM{1 1 0 1} In{64} Out{64}
 	DepthLayerTree : Columns{DEPREL} Buffer{} Stack{2 1 0} LayerSizes{3} LSTM{1 1 0.0 1} In{64} Out{64}
+	History : NbElem{10} LSTM{1 1 0 1} In{64} Out{64}
 	InputDropout : 0.5
 	MLP : {2048 0.3 2048 0.3}
 	End
@@ -26,8 +26,8 @@ Strategy
 	tagger morpho * 0
 	morpho parser NOTHING 0
 	morpho morpho * 0
-	parser segmenter SHIFT 0
-	parser segmenter RIGHT 0
+	parser segmenter eager_SHIFT 0
+	parser segmenter eager_RIGHT_rel 0
 	parser parser * 0
 	segmenter tagger * 1
 }
diff --git a/UD_any/tagparser_seq/machine.rm b/UD_any/tagparser_seq/machine.rm
index 504a13019ab09c001f9f682c283dd17cccc4864e..f07fae0cbfc4fd49b30ddbfc1fd3edd1bf8ef2c5 100644
--- a/UD_any/tagparser_seq/machine.rm
+++ b/UD_any/tagparser_seq/machine.rm
@@ -1,10 +1,9 @@
 Name : Tagger, Feats , Parser and Segmenter sequential Machine
 Classifier : tagparser
 {
-	Transitions : {tagger,data/tagger.ts morpho,data/morpho_parts.ts parser,data/parser.ts segmenter,data/segmenter.ts}
+	Transitions : {tagger,data/tagger.ts morpho,data/morpho_parts.ts parser,data/parser_eager_rel_strict.ts segmenter,data/segmenter.ts}
 	LossMultiplier : {segmenter,10.0}
 	Network type : Modular
-#	AppliableTrans :  
 	StateName : Out{64}
 	Context : Buffer{-3 -2 -1 0 1 2} Stack{} Columns{FORM} LSTM{1 1 0 1} In{64} Out{64}
 	Context : Buffer{-3 -2 -1 0 1 2} Stack{1 0} Columns{UPOS} LSTM{1 1 0 1} In{64} Out{64}
@@ -14,6 +13,7 @@ Classifier : tagparser
 	Focused : Column{EOS} NbElem{1} Buffer{-1} Stack{} LSTM{1 1 0 1} In{64} Out{64}
 	Focused : Column{DEPREL} NbElem{1} Buffer{} Stack{2 1 0} LSTM{1 1 0 1} In{64} Out{64}
 	DepthLayerTree : Columns{DEPREL} Buffer{} Stack{2 1 0} LayerSizes{3} LSTM{1 1 0.0 1} In{64} Out{64}
+	History : NbElem{10} LSTM{1 1 0 1} In{64} Out{64}
 	InputDropout : 0.5
 	MLP : {2048 0.3 2048 0.3}
 	End
@@ -28,8 +28,8 @@ Strategy
 	morpho morpho NOTHING 1
 	morpho morpho * 0
 	Block : End{cannotMove}
-	parser segmenter SHIFT 0
-	parser segmenter RIGHT 0
+	parser segmenter eager_SHIFT 0
+	parser segmenter eager_RIGHT_rel 0
 	parser parser * 0
 	segmenter parser * 1
 }