diff --git a/src/estonian/ExtraEst.gf b/src/estonian/ExtraEst.gf
index 58c4818a..baa67796 100644
--- a/src/estonian/ExtraEst.gf
+++ b/src/estonian/ExtraEst.gf
@@ -9,7 +9,9 @@ concrete ExtraEst of ExtraEstAbs = CatEst **
       isNeg = False 
      } ;
 
-    GenCN n1 n2 = {s = \\nf => n1.s ! NPCase Gen ++ n2.s ! nf} ;
+    GenCN = caseCN Gen ;     -- auton merkki
+    ComitCN = caseCN Comit ; -- puudega mets
+    ElatCN  = caseCN Elat ;  -- puust laud
 
     GenIP ip = {s = \\_,_ => ip.s ! NPCase Gen} ;
 
@@ -18,6 +20,9 @@ concrete ExtraEst of ExtraEstAbs = CatEst **
       a = RNoAg 
 ---      a = RAg (agrP3 num.n)
       } ;
+  oper 
+    caseCN : Case -> NP -> CN -> CN = \c,np,cn ->
+      lin CN { s = \\nf => np.s ! NPCase c ++ cn.s ! nf } ;
 
   lincat
     VPI   = {s : InfForm => Str} ;
@@ -137,15 +142,13 @@ concrete ExtraEst of ExtraEstAbs = CatEst **
         isPron = False ; isNeg = False
         } ;
 
-    vai_Conj = {s1 = [] ; s2 = "vai" ; n = Sg} ;
-
     --The reflexive possessive "oma"
     --for "ta näeb oma koera" instead of *"tema koera"
     OmaPoss = {s,sp = \\_,_ => "oma" ; isDef,isNeg,isNum = False} ;
     
-    ma_Pron = mkPronoun "ma" "mu" "mind" Sg P1 ;
-    sa_Pron = mkPronoun "sa" "su" "sind" Sg P2;
-    ta_Pron = mkPronoun "ta" "ta" "teda" Sg P3 ;
+    ma_Pron = shortPronoun "ma" "mu" "mind" "minu" Sg P1 ;
+    sa_Pron = shortPronoun "sa" "su" "sind" "sinu" Sg P2;
+    ta_Pron = shortPronoun "ta" "ta" "teda" "tema" Sg P3 ;
     me_Pron = 
     {s = table {
         NPCase Nom => "me" ;
diff --git a/src/estonian/ExtraEstAbs.gf b/src/estonian/ExtraEstAbs.gf
index df9732da..761200cf 100644
--- a/src/estonian/ExtraEstAbs.gf
+++ b/src/estonian/ExtraEstAbs.gf
@@ -8,6 +8,8 @@ abstract ExtraEstAbs = Extra [
   flags coding=utf8 ;
   fun
     GenCN : NP -> CN -> CN ;              -- auton merkki
+    ComitCN : NP -> CN -> CN ;            -- põlenud puudega mets
+    ElatCN : NP -> CN -> CN ;             -- puust laud
 
     AdvExistNP : Adv -> NP -> Cl ;        -- kuvassa olemme me
     AdvPredNP  : Adv -> V  -> NP -> Cl ;  -- kuvassa hymyilee Veikko
@@ -22,8 +24,6 @@ abstract ExtraEstAbs = Extra [
 
     PartCN : CN -> NP ;                   -- olutta
 
-    vai_Conj : Conj ;                     -- minä vai sinä? ("or" in question)
-
     --Short forms of the pronouns
     ma_Pron : Pron ;
     sa_Pron : Pron ;