diff --git a/src/fst/morphology/affixes/nouns.lexc b/src/fst/morphology/affixes/nouns.lexc
index 50b8236c..c82b9aa4 100644
--- a/src/fst/morphology/affixes/nouns.lexc
+++ b/src/fst/morphology/affixes/nouns.lexc
@@ -4326,12 +4326,12 @@ LEXICON NMN_1E_VWQSS
:%^PALE%^PAL%^CC2CCC%^PALK E-STEM-PX-STRENGTHEN-WITH-PAL ; !!= * @CODE@ (12) vueʹsˈs Ess+Px..
-LEXICON N_BIEQSS !!= * @CODE@ bieʹss:beâss
+LEXICON N_1E_IY/EQKK !!= * @CODE@ bieʹss:beâss
!!! inflection_type="?"
! vowel: diphthong
!! N_1E_VWQSS
-: NMN_BIEQSS ;
-LEXICON NMN_BIEQSS
+: NMN_1E_IY/EQKK ;
+LEXICON NMN_1E_IY/EQKK
!! Sg_Nom: vow_di:vow_short:vow_high_u:pal_yes:cns_gem
! gradation: yes
! weak: geminate
@@ -4369,13 +4369,13 @@ LEXICON NMN_BIEQSS
:%^PALE%^PAL%^CC2CAllegro%^PALK E-STEM-PX-ALLEGRO ; !!= * @CODE@ (11) bieʹss-
:%^PALE%^PAL%^CC2CCC%^PALK E-STEM-PX-STRENGTHEN-WITH-PAL ; !!= * @CODE@ (12) bieʹsˈs- Ess+Px..
-LEXICON N_SKHIEQRR !!= * @CODE@ sǩieʹrr:sǩeâ%{ʹØ%}rr
+LEXICON N_1E_IEQCC !!= * @CODE@ sǩieʹrr:sǩeâ%{ʹØ%}rr
!!! inflection_type="?"
! vowel: diphthong
!! N_1E_VWQCC kueʹll
-: NMN_SKHIEQRR ;
+: NMN_1E_IEQCC ;
-LEXICON NMN_SKHIEQRR
+LEXICON NMN_1E_IEQCC
!! Sg_Nom: vow_di:vow_short:vow_high_u:pal_yes:cns_gem
! gradation: yes
! weak: geminate
@@ -6365,7 +6365,6 @@ LEXICON N_PEIQVV-PL
! diphthongs
-
LEXICON N_PIEAQSS !!= * @CODE@ pieʹss:peäss
!!! inflection_type="?"
! vowel: diphthong
@@ -6408,6 +6407,48 @@ LEXICON NMN_PIEAQSS
:%^PAL%^CC2CCC E-STEM-PX-STRENGTHEN-WITH-PAL ; !!= * @CODE@ (12) peäʹsˈs Ess+Px..
+LEXICON N_1E_IEAQKK !!= * @CODE@ lieʹǩǩ:leä%{ʹØ%}kk
+!!! inflection_type="?"
+! vowel: diphthong
+: NMN_1E_IEAQKK ;
+LEXICON NMN_1E_IEAQKK
+! gradation: yes
+!! ## 1. WORDS WITH SINGLE-SYLLABLE NOMINATIVE SINGULARS (2009: 180, 197-199)
+!! ## 1.3 Sg.Loc in -est (vowel shift)
+!! Raised: ELSE
+!! Lowered: Sg.Ill
+!! e-stems (Sg.Loc, Ess, Par).
+!! ## 1.3.2 Sg.Ill vowel -a
+!! ## 1.3.2.1 Has Palatalization
+!! Palatalized: ELSE
+!! Not Palatalized: Sg.Ill
+!! ## 1.3.2.1.1 Lacks Specifically Pedagogical Gradation
+!! ## 1.3.2.1.1.1 Has Orthographic Gradation
+!! ## 1.3.2.1.1.1[] (Diphthong + Consonant Geminate variation)
+!! Strong grade: Sg.Nom, Ess, Par
+!! Extra strong grade: Sg.Ill
+!! Weak grade: Pl.Nom, Sg.Loc, Sg.Com
+!! ## FORMS
+!! ## (8) Pl.Acc: pieʹzzid
+!! * Yaml: **N-piess, N-kjiechch**
+:%^CC2CCC E-STEM_SG-ILL ; !!(3) Sg.Ill: peäsˈsa
+:%^VOWRaise%^PALẸ%^PAL%^KK2GG%^PALK DenominalAdjsCShort ;
+:%^VOWRaise%^PALẸ%^PAL%^PALK E-STEM_SG-NOM ; !!(1) Sg.Nom: piẹʹss
+:%^VOWRaise%^PALẸ%^PAL%^KK2GG%^PALK E-STEM_SG-ABE/ACC/GEN ; !!(2) Pl.Nom: piẹʹzz
+:%^KK2GG A_DER/LAZH ;
+:%^VOWRaise%^PALẸ%^PAL%^KK2GG%^PALK PL-NOM ; !!(2) Pl.Nom: piẹʹzz
+:%^VOWRaise%^PALẸ%^PAL%^KK2GG%^PALK%>e SG-LOC ; !!(4) Sg.Loc: piẹʹzzest
+
+:%^VOWRaise%^PALE%^PAL%^KK2GG%^PALK SG-COM_IN ; !!(5) Sg.Com: pieʹzzin
+:%^VOWRaise%^PALE%^PAL%^KK2GG%^PALK E-STEM_PL-OBL ; !!(5) Sg.Com: pieʹzzin
+:%^VOWRaise%^PALẸ%^PAL%^PALK%>e ESS/PAR ; !!(6) Ess: piẹʹssen
+
+:%^KK2GG E-STEM_N_KUYLAZH ; !!(9) Der/Dimin.N.Sg.Nom: peäzzaž
+ E-STEM-PX-RETAIN-WITHOUT-PAL ; !!= * @CODE@ (10) peäss-
+:%^PAL%^KK2GAllegro%^PALK E-STEM-PX-ALLEGRO ; !!= * @CODE@ (11) piẹʹz-
+:%^PAL%^CC2CCC%^PALK E-STEM-PX-STRENGTHEN-WITH-PAL ; !!= * @CODE@ (12) peäʹsˈs Ess+Px..
+
+
LEXICON N_SUEAQKHKH !!= * @CODE@ sueʹǩǩ:suä%{ʹØ%}kk
!!! inflection_type="?"
! vowel: diphthong
diff --git a/src/fst/morphology/stems/N_sms2x.lexc b/src/fst/morphology/stems/N_sms2x.lexc
index dd3cf108..b06414bc 100644
--- a/src/fst/morphology/stems/N_sms2x.lexc
+++ b/src/fst/morphology/stems/N_sms2x.lexc
@@ -508,7 +508,7 @@ bibliograaf+N:bibliograa%{ʹØ%}f N_PLAAN "bibliograafi" ;
bieʹll+N:beä%{ʹØ%}ll N_MIEAQRR "" ;
bieʹllvuäzzlaž+N:bieʹllvuäzz»l N_MEERSAZH "puoliosakas" ;
bieʹss+v1+N:beâ%{ʹØ%}sˈs N_MIEQLLL "piru" ;
-bieʹss+N:beâ%{ʹØ%}ss N_BIEQSS "piru" ;
+bieʹss+N:beâ%{ʹØ%}ss N_1E_IEQCC "piru" ;
bieʹzmen+N:bieʹzmen N_AANAR "puntari" ;
bieʹǩǩ+N:beâ%{ʹØ%}kˈk N_1E_IY/EQKKK "osa" ;
biljardd+N:bilja%^1VOW%{ʹØ%}rdd N_ALGG "biljaardi" ;
@@ -2287,7 +2287,7 @@ jieʹttvarjjlõs+N:jieʹttvarjjlõ%^1VOW%{ʹØ%}s N_5Y_VS_VVZZ "hätävarjelu"
jieʹttvaull+N:jieʹttva%^1VOWu%{ʹØ%}ll N_AUTT "hätäjarru" ;
jieʹttšõddummuš+v1+N:jieʹttšõddummuš N_MAINSTUMMUSH "hätäsynnytys" ;
jieʹttšõddummuš+v2+N+Err/Orth:jieʹttšõddumu%^1VOW%{ʹØ%}š N_5Y_VS_VVZZ "hätäsynnytys" ;
-jieʹǩǩ+N:jeä%{ʹØ%}kk N_PIEAQSS "setä" ;
+jieʹǩǩ+N:jeä%{ʹØ%}kk N_1E_IEAQKK "setä" ;
jieʹǩǩev+N:jieʹǩǩev N_AANAR "vanhemman veljen lapsi" ;
jieʹǩǩi+N:jieʹǩǩi N_PRSPRC-VWQKK-I "jiekiö" ;
jiõččsåʹrmm+N:jiõčč#så%^1VOW%{ʹØ%}rmm N_KAQLBB "itsemurha" ;
@@ -6016,7 +6016,7 @@ lieʹđđišnåpp+N:lieʹđˈđišnå%^1VOWpp N_PESS "kukkakimppu" ;
lieʹđđummuš+v1+N:lieʹđđummuš N_MAINSTUMMUSH "leimuaminen" ;
lieʹđđummuš+v2+N+Err/Orth:lieʹđđumu%^1VOW%{ʹØ%}š N_5Y_VS_VVZZ "leimuaminen" ;
lieʹŋǧ+N:leä%{ʹØ%}ŋgg N_1E_EAQYKK-PL "länget" ;
-lieʹǩǩ+N:leä%{ʹØ%}kk N_PIEAQSS "laakso" ;
+lieʹǩǩ+N:leä%{ʹØ%}kk N_1E_IEAQKK "laakso" ;
liikkeei+N:liikkẹẹ N_PRSPRC-EEI "liikkuja" ;
liikkeemenergia+N:liikkeemenergia N_BIOLOGIA "liike-energia" ;
liikkeemluʹvddkåʹdd+N:liikkeemluʹvdd#kå%^1VOW%{ʹØ%}dd N_LOAQDD "liikuntalautakunta" ;
@@ -7620,7 +7620,7 @@ moolčtõs+N:moolčtõ%^1VOW%{ʹØ%}s N_5Y_VS_VVZZ "lipsahdus" ;
moolččmõš+v1+N:moolčč»mõ%^1VOW%{ʹØ%}š N_5Y_VS_VVZZ "lipsuminen" ;
moolččmõš+v2+N+Use/SpellNoSugg:moolččmu%^1VOW%{ʹØ%}š N_5Y_VS_VVZZ "lipsuminen" ;
moordõs+N:moordõ%^1VOW%{ʹØ%}s N_5Y_VS_VVZZ "murros" ;
-moordõslieʹǩǩ+N:moordõs#leä%{ʹØ%}kk N_PIEAQSS "murroslaakso" ;
+moordõslieʹǩǩ+N:moordõs#leä%{ʹØ%}kk N_1E_IEAQKK "murroslaakso" ;
moorâs+N:mo%^1VOWrrâs N_VOONYS "aortta" ;
moorâč+N:moorâč N_AANAR "sepelvaltimo" ;
moorâčmaaddi+N:moorâč#maaddi N_ "keuhkoputki" ;
@@ -13938,7 +13938,7 @@ sieʹvvummuš+v2+N+Err/Orth:sieʹvvumu%^1VOW%{ʹØ%}š N_5Y_VS_VVZZ "vilkuttami
sieʹvvõs+N:sieʹvvõ%^1VOW%{ʹØ%}s N_5Y_VS_VVZZ "viittaus" ;
sieʹđnnjummuš+v1+N:sieʹđnn»jummuš N_MAINSTUMMUSH "hylkääminen" ;
sieʹđnnjummuš+v2+N+Err/Orth:sieʹđnnjumu%^1VOW%{ʹØ%}š N_5Y_VS_VVZZ "hylkääminen" ;
-sieʹǩǩ+N:seâ%{ʹØ%}kk N_BIEQSS "kirvestuppi" ;
+sieʹǩǩ+N:seâ%{ʹØ%}kk N_1E_IY/EQKK "kirvestuppi" ;
sieʹǩǩmeäʹcc+N:sieʹǩǩ#meä%{ʹØ%}cˈc N_JEAQNNN "sekametsä" ;
sieʹǩǩporrmõš+v1+N:sieʹǩǩporr»mõ%^1VOW%{ʹØ%}š N_5Y_VS_VVZZ "sekaravinto" ;
sieʹǩǩporrmõš+v2+N+Use/SpellNoSugg:sieʹǩǩporr»mu%^1VOW%{ʹØ%}š N_5Y_VS_VVZZ "sekaravinto" ;
@@ -15661,7 +15661,7 @@ sǩeʹlŋŋčâʹlmm+N:sǩeʹlŋŋ#čâ%^1VOW%{ʹØ%}lmm N_KAQLBB "kierosilmä"
sǩeʹrmmpeiʹvv+N:sǩeʹrmm#pẹ%^1VOWi%{ʹØ%}vv N_PEIQVV "päivä" ;
sǩieʹlŋŋčâʹlmm+N:sǩieʹlŋŋ#čâ%^1VOW%{ʹØ%}lmm N_KAQLBB "kierosilmä" ;
sǩieʹrmmpeiʹvv+N:sǩieʹrmm#pẹ%^1VOWi%{ʹØ%}vv N_PEIQVV "sumea" ;
-sǩieʹrr+N:sǩiâ%{ʹØ%}rr N_SKHIEQRR "vaivaiskoivu" ;
+sǩieʹrr+N:sǩeâ%{ʹØ%}rr N_1E_IEQCC "vaivaiskoivu" ;
sǩieʹrri+N:sǩieʹrri N_HOQPPI "vaivaiskoivu" ;
sǩieʹrrsueʹǩǩ+N:sǩieʹrr#suä%{ʹØ%}kk N_SUEAQKHKH "vaivaiskoivu" ;
sǩieʹrčč+N:sǩeâ%{ʹØ%}rčč N_MIEQLKHKH "käry" ;
diff --git a/src/fst/morphology/stems/N_sms2x.xml b/src/fst/morphology/stems/N_sms2x.xml
index b227da77..71efb742 100644
--- a/src/fst/morphology/stems/N_sms2x.xml
+++ b/src/fst/morphology/stems/N_sms2x.xml
@@ -10444,7 +10444,7 @@
beâ%{ʹØ%}sˈs
- beâ%{ʹØ%}ss
+ beâ%{ʹØ%}ss
1446
@@ -46760,7 +46760,7 @@
jiäʹǩǩ
- jeä%{ʹØ%}kk
+ jeä%{ʹØ%}kk
5754
@@ -124217,7 +124217,7 @@
liäʹǩǩ
- leä%{ʹØ%}kk
+ leä%{ʹØ%}kk
5791
@@ -157046,7 +157046,7 @@
moordõslieʹǩǩ
- moordõs#leä%{ʹØ%}kk
+ moordõs#leä%{ʹØ%}kk
@@ -289244,7 +289244,7 @@
sieʹǩǩ
- seâ%{ʹØ%}kk
+ seâ%{ʹØ%}kk
@@ -325274,7 +325274,7 @@
sǩieʹrr
- sǩiâ%{ʹØ%}rr
+ sǩeâ%{ʹØ%}rr