Index: languages/apertium-pol/apertium-pol.pol.dix
===================================================================
--- languages/apertium-pol/apertium-pol.pol.dix	(revision 70244)
+++ languages/apertium-pol/apertium-pol.pol.dix	(revision 70245)
@@ -2716,7 +2716,7 @@
     </pardef>
 
 <!-- Demonstratives -->    
-    <pardef n="BASE__to">      
+<!--     <pardef n="BASE__to">      
       <e><p><l>ten</l><r>to<s n="det"/><s n="dem"/><s n="mp"/><s n="sg"/><s n="nom"/></r></p></e>      
       <e><p><l>ten</l><r>to<s n="det"/><s n="dem"/><s n="ma"/><s n="sg"/><s n="nom"/></r></p></e>      
       <e><p><l>ten</l><r>to<s n="det"/><s n="dem"/><s n="mi"/><s n="sg"/><s n="nom"/></r></p></e>      
@@ -2776,13 +2776,81 @@
       <e><p><l>tych</l><r>to<s n="det"/><s n="dem"/><s n="mi"/><s n="pl"/><s n="loc"/></r></p></e>      
       <e><p><l>tych</l><r>to<s n="det"/><s n="dem"/><s n="f"/><s n="pl"/><s n="loc"/></r></p></e>      
       <e><p><l>tych</l><r>to<s n="det"/><s n="dem"/><s n="nt"/><s n="pl"/><s n="loc"/></r></p></e>    
+    </pardef> -->
+
+ <pardef n="BASE__to">      
+      <e><p><l>ten</l><r><s n="dem"/><s n="mp"/><s n="sg"/><s n="nom"/></r></p></e>      
+      <e><p><l>ten</l><r><s n="dem"/><s n="ma"/><s n="sg"/><s n="nom"/></r></p></e>      
+      <e><p><l>ten</l><r><s n="dem"/><s n="mi"/><s n="sg"/><s n="nom"/></r></p></e>      
+      <e><p><l>ta</l><r><s n="dem"/><s n="f"/><s n="sg"/><s n="nom"/></r></p></e>      
+      <e><p><l>to</l><r><s n="dem"/><s n="nt"/><s n="sg"/><s n="nom"/></r></p></e>      
+      <e><p><l>ci</l><r><s n="dem"/><s n="mp"/><s n="pl"/><s n="nom"/></r></p></e>      
+      <e><p><l>te</l><r><s n="dem"/><s n="ma"/><s n="pl"/><s n="nom"/></r></p></e>      
+      <e><p><l>te</l><r><s n="dem"/><s n="mi"/><s n="pl"/><s n="nom"/></r></p></e>      
+      <e><p><l>te</l><r><s n="dem"/><s n="f"/><s n="pl"/><s n="nom"/></r></p></e>      
+      <e><p><l>te</l><r><s n="dem"/><s n="nt"/><s n="pl"/><s n="nom"/></r></p></e>      
+      <e><p><l>tego</l><r><s n="dem"/><s n="mp"/><s n="sg"/><s n="gen"/></r></p></e>      
+      <e><p><l>tego</l><r><s n="dem"/><s n="ma"/><s n="sg"/><s n="gen"/></r></p></e>      
+      <e><p><l>tego</l><r><s n="dem"/><s n="mi"/><s n="sg"/><s n="gen"/></r></p></e>      
+      <e><p><l>tej</l><r><s n="dem"/><s n="f"/><s n="sg"/><s n="gen"/></r></p></e>      
+      <e><p><l>tego</l><r><s n="dem"/><s n="nt"/><s n="sg"/><s n="gen"/></r></p></e>      
+      <e><p><l>tych</l><r><s n="dem"/><s n="mp"/><s n="pl"/><s n="gen"/></r></p></e>      
+      <e><p><l>tych</l><r><s n="dem"/><s n="ma"/><s n="pl"/><s n="gen"/></r></p></e>      
+      <e><p><l>tych</l><r><s n="dem"/><s n="mi"/><s n="pl"/><s n="gen"/></r></p></e>      
+      <e><p><l>tych</l><r><s n="dem"/><s n="f"/><s n="pl"/><s n="gen"/></r></p></e>      
+      <e><p><l>tych</l><r><s n="dem"/><s n="nt"/><s n="pl"/><s n="gen"/></r></p></e>      
+      <e><p><l>temu</l><r><s n="dem"/><s n="mp"/><s n="sg"/><s n="dat"/></r></p></e>      
+      <e><p><l>temu</l><r><s n="dem"/><s n="ma"/><s n="sg"/><s n="dat"/></r></p></e>      
+      <e><p><l>temu</l><r><s n="dem"/><s n="mi"/><s n="sg"/><s n="dat"/></r></p></e>      
+      <e><p><l>tej</l><r><s n="dem"/><s n="f"/><s n="sg"/><s n="dat"/></r></p></e>      
+      <e><p><l>temu</l><r><s n="dem"/><s n="nt"/><s n="sg"/><s n="dat"/></r></p></e>      
+      <e><p><l>tym</l><r><s n="dem"/><s n="mp"/><s n="pl"/><s n="dat"/></r></p></e>      
+      <e><p><l>tym</l><r><s n="dem"/><s n="ma"/><s n="pl"/><s n="dat"/></r></p></e>      
+      <e><p><l>tym</l><r><s n="dem"/><s n="mi"/><s n="pl"/><s n="dat"/></r></p></e>      
+      <e><p><l>tym</l><r><s n="dem"/><s n="f"/><s n="pl"/><s n="dat"/></r></p></e>      
+      <e><p><l>tym</l><r><s n="dem"/><s n="nt"/><s n="pl"/><s n="dat"/></r></p></e>      
+      <e><p><l>tego</l><r><s n="dem"/><s n="mp"/><s n="sg"/><s n="acc"/></r></p></e>      
+      <e><p><l>tego</l><r><s n="dem"/><s n="ma"/><s n="sg"/><s n="acc"/></r></p></e>      
+      <e><p><l>ten</l><r><s n="dem"/><s n="mi"/><s n="sg"/><s n="acc"/></r></p></e>      
+      <e><p><l>to</l><r><s n="dem"/><s n="nt"/><s n="sg"/><s n="acc"/></r></p></e>      
+      <e><p><l>tych</l><r><s n="dem"/><s n="mp"/><s n="pl"/><s n="acc"/></r></p></e>      
+      <e><p><l>te</l><r><s n="dem"/><s n="ma"/><s n="pl"/><s n="acc"/></r></p></e>      
+      <e><p><l>te</l><r><s n="dem"/><s n="mi"/><s n="pl"/><s n="acc"/></r></p></e>      
+      <e><p><l>te</l><r><s n="dem"/><s n="f"/><s n="pl"/><s n="acc"/></r></p></e>      
+      <e><p><l>te</l><r><s n="dem"/><s n="nt"/><s n="pl"/><s n="acc"/></r></p></e>      
+      <e><p><l>tym</l><r><s n="dem"/><s n="mp"/><s n="sg"/><s n="ins"/></r></p></e>      
+      <e><p><l>tym</l><r><s n="dem"/><s n="ma"/><s n="sg"/><s n="ins"/></r></p></e>      
+      <e><p><l>tym</l><r><s n="dem"/><s n="mi"/><s n="sg"/><s n="ins"/></r></p></e>      
+      <e><p><l>tą</l><r><s n="dem"/><s n="f"/><s n="sg"/><s n="ins"/></r></p></e>      
+      <e><p><l>tym</l><r><s n="dem"/><s n="nt"/><s n="sg"/><s n="ins"/></r></p></e>      
+      <e><p><l>tymi</l><r><s n="dem"/><s n="mp"/><s n="pl"/><s n="ins"/></r></p></e>      
+      <e><p><l>tymi</l><r><s n="dem"/><s n="ma"/><s n="pl"/><s n="ins"/></r></p></e>      
+      <e><p><l>tymi</l><r><s n="dem"/><s n="mi"/><s n="pl"/><s n="ins"/></r></p></e>      
+      <e><p><l>tymi</l><r><s n="dem"/><s n="f"/><s n="pl"/><s n="ins"/></r></p></e>      
+      <e><p><l>tymi</l><r><s n="dem"/><s n="nt"/><s n="pl"/><s n="ins"/></r></p></e>      
+      <e><p><l>tym</l><r><s n="dem"/><s n="mp"/><s n="sg"/><s n="loc"/></r></p></e>      
+      <e><p><l>tym</l><r><s n="dem"/><s n="ma"/><s n="sg"/><s n="loc"/></r></p></e>      
+      <e><p><l>tym</l><r><s n="dem"/><s n="mi"/><s n="sg"/><s n="loc"/></r></p></e>      
+      <e><p><l>tej</l><r><s n="dem"/><s n="f"/><s n="sg"/><s n="loc"/></r></p></e>      
+      <e><p><l>tym</l><r><s n="dem"/><s n="nt"/><s n="sg"/><s n="loc"/></r></p></e>      
+      <e><p><l>tych</l><r><s n="dem"/><s n="mp"/><s n="pl"/><s n="loc"/></r></p></e>      
+      <e><p><l>tych</l><r><s n="dem"/><s n="ma"/><s n="pl"/><s n="loc"/></r></p></e>      
+      <e><p><l>tych</l><r><s n="dem"/><s n="mi"/><s n="pl"/><s n="loc"/></r></p></e>      
+      <e><p><l>tych</l><r><s n="dem"/><s n="f"/><s n="pl"/><s n="loc"/></r></p></e>      
+      <e><p><l>tych</l><r><s n="dem"/><s n="nt"/><s n="pl"/><s n="loc"/></r></p></e>    
     </pardef>
     
     <pardef n="/to__det">      
-      <e><i/><par n="BASE__to"/></e>      
+      <e><p><l></l><r>to<s n="det"/></r></p><par n="BASE__to"/></e>      
       <e><p><l>tę</l><r>to<s n="det"/><s n="dem"/><s n="f"/><s n="sg"/><s n="acc"/></r></p></e>      
       <e r="LR"><p><l>tą</l><r>to<s n="det"/><s n="dem"/><s n="f"/><s n="sg"/><s n="acc"/></r></p></e>    
     </pardef>
+
+    <pardef n="/to__prn">      
+      <e><p><l></l><r>to<s n="prn"/></r></p><par n="BASE__to"/></e>      
+      <e><p><l>tę</l><r>to<s n="prn"/><s n="dem"/><s n="f"/><s n="sg"/><s n="acc"/></r></p></e>      
+      <e r="LR"><p><l>tą</l><r>to<s n="prn"/><s n="dem"/><s n="f"/><s n="sg"/><s n="acc"/></r></p></e>    
+    </pardef>
     
     <pardef n="tam/to__det">      
       <e><i/><par n="BASE__to"/></e>      
@@ -7902,6 +7970,17 @@
       <e><p><l>ie</l><r><s n="n"/><s n="mi"/><s n="sg"/><s n="voc"/></r></p></e>      
       <e><p><l></l><r><s n="n"/><s n="mi"/></r></p><par n="PBASE__bat_pl"/></e>       
     </pardef>
+
+    <pardef n="dom__n">      
+      <e><p><l></l><r><s n="n"/><s n="mi"/><s n="sg"/><s n="nom"/></r></p></e>      
+      <e><p><l>u</l><r><s n="n"/><s n="mi"/><s n="sg"/><s n="gen"/></r></p></e>      
+      <e><p><l>owi</l><r><s n="n"/><s n="mi"/><s n="sg"/><s n="dat"/></r></p></e>      
+      <e><p><l></l><r><s n="n"/><s n="mi"/><s n="sg"/><s n="acc"/></r></p></e>      
+      <e><p><l>em</l><r><s n="n"/><s n="mi"/><s n="sg"/><s n="ins"/></r></p></e>      
+      <e><p><l>u</l><r><s n="n"/><s n="mi"/><s n="sg"/><s n="loc"/></r></p></e>      
+      <e><p><l>u</l><r><s n="n"/><s n="mi"/><s n="sg"/><s n="voc"/></r></p></e>      
+      <e><p><l></l><r><s n="n"/><s n="mi"/></r></p><par n="PBASE__bat_pl"/></e>       
+    </pardef>
     
     <pardef n="minus__n">      
       <e><p><l></l><r><s n="n"/><s n="mi"/><s n="sg"/><s n="nom"/></r></p></e>      
@@ -10346,6 +10425,7 @@
     <e lm="tyle"><i>tyle</i><par n="dużo__det"/></e>    
     <e lm="każdy"><i>każd</i><par n="każd/y__det"/></e>    
     <e lm="to"><i></i><par n="/to__det"/></e>    
+    <e lm="to"><i></i><par n="/to__prn"/></e>    
     <e lm="taki"><i>ta</i><par n="ta/ki__det"/></e>    
     <e lm="co"><i>c</i><par n="c/o__det"/></e>    
     <e lm="tamto"><i>tam</i><par n="tam/to__det"/></e>    
@@ -19149,7 +19229,7 @@
     <e lm="platan"><i>platan</i><par n="minus__n"/></e>    
     <e lm="petarda"><i>petard</i><par n="od/a__n"/></e>    
     <e lm="orangutan"><i>orangutan</i><par n="rekin__n"/></e>    
-    <e lm="dom"><i>dom</i><par n="sklep__n"/></e>    
+    <e lm="dom"><i>dom</i><par n="dom__n"/></e>    
     <e lm="człon"><i>człon</i><par n="sklep__n"/></e>    
     <e lm="patos"><i>patos</i><par n="sklep__n"/></e>    
     <e lm="plankton"><i>plankton</i><par n="sklep__n"/></e>    
Index: languages/apertium-pol/apertium-pol.pol.rlx
===================================================================
--- languages/apertium-pol/apertium-pol.pol.rlx	(revision 70244)
+++ languages/apertium-pol/apertium-pol.pol.rlx	(revision 70245)
@@ -9,7 +9,10 @@
 LIST N = n ;
 LIST Det = det ;
 LIST Vblex = Vblex ;
+LIST Adj = adj ;
+LIST Prn = prn ;
 LIST Je = "<je>"i ;
+LIST To = "<to>"i ;
 LIST Być = "być" ;
 
 LIST Nom = nom ; 
@@ -50,6 +53,7 @@
 # 2. if a word is a determiner and the following word is female/male/neuter, leave only the variants with this gender
 SELECT Det + $$GEND IF (1 $$GEND) ;
 # 3. if the following word is a noun, remove the pronoun readings
+# SELECT 
 # 4. if a word is a determiner and the following word is ma, remove all the readings that don't have this tag
 # 5. if a word is a noun and a previous word is a determiner, remove all the readings with cases that differ from cases in all the readings of the determiner
 REMOVE N + $$NAGDILV IF (NOT -1 $$NAGDILV) ; 
@@ -57,11 +61,24 @@
 REMOVE Acc IF (0 Je) (NEGATE -1* Fin) (NEGATE 1* Fin) (NOT -1 Pl) ;
 # 7. if there is no other verb in the sentence and there is an ambiguity between verb and pronoun, select the verb reading
 SELECT Fin IF (NEGATE -1* Fin) (NEGATE 1* Fin) (NOT -1 Pl) ; 
-# 8. if anywhere in the sentance there is a noun with unambiguous nominative case and there is no verb być, remove nom
-REMOVE Nom IF (NEGATE -1* Być) (NEGATE 1* Być) (0 Nom OR Acc) ; 
+# 8. if anywhere in the sentence there is a noun with unambiguous nominative case and there is no verb być and there is ambiguity between nom and acc, 
+#remove nom
+REMOVE Nom IF (0C* Nom) (NEGATE -1* Być) (NEGATE 1* Być) (0 Nom OR Acc) ; 
+# if there is a verb być in the sentence and there are no other nouns in the sentence and there is ambiguity between nom and acc, select nom reading
+SELECT Nom IF (NEGATE -1* N + Nom) (NEGATE 1* N + Nom) (0* Być) (0 Nom OR Acc) ;
+# if there is an adjective there is no noun after it and there is a verb być in the sentence, and it is ambiguous between nom and acc, select nom
+SELECT Nom IF (0 Adj) (NOT 1* N) (0* Być) (0 Nom OR Acc) ;
+# if the situation is like in the previous rule and there is a noun in nominative before the current word, select the reading with the gender of this noun
+SELECT $$GEND IF (0 Adj) (NOT 1* N) (0* Być) (NOT 0 Ins) (-1* N + $$GEND) ;
+# if the first word is a pronoun to and the second word is the verb być and it is ambiguous between nom and acc, select the nominative reading
+SELECT Nom IF (0 To) (0* Być) (0 Nom OR Acc) ;
 
+
+
 SECTION
 
-REMOVE Voc IF (NOT 1 Cm) ; 
+# remove the reading with locative if there is no comma after it
+REMOVE Voc IF (NOT 1 Cm) ;
 
 
+