diff --git a/ML/pada.ml b/ML/pada.ml
index cd5f420e30a39b24f501aa384dbe9881bb060e8b..d9152a2375f4f8271e2aaae7ce1f52f36f9f5fe6 100644
--- a/ML/pada.ml
+++ b/ML/pada.ml
@@ -109,7 +109,7 @@ value voices_of = fun
   | "kram" | "krii" | "k.san" | "k.sap#1" | "k.sal" | "k.sip" | "k.sud" | "khan" 
   | "gam" | "garh" | "guh" | "gras" | "gha.t.t" | "cat" | "carc" | "ci"
   | "cint" | "cud" | "ce.s.t" | "cyu" | "chad#1" | "chand" | "chid#1" | "jan" 
-  | "juu" | "j~naa#1" | "jyaa#1" | "jyut" | "ta.d" | "tan#1" | "tan#2" 
+  | "juu" | "j~naa#1" | "jyaa#1" | "jyut" | "ta.d" | "tan#1" | "tan#2" | "tap"
   | "tud#1" | "tul" | "t.rd" | "daaz#1" | "diz#1" | "dih" | "duh#1"
   | "dev#1" | "draa#2" | "dvi.s#1" | "dhaa#1" | "dhaav#1" | "dhaav#2" 
   | "dhuu#1" | "dh.r" | "dhva.ms" | "nah" | "naath" | "nij" | "nii#1"
@@ -141,7 +141,7 @@ jan 4A 1U
 j.rr 1U 4P
 jyaa1 4A 9P
 .damb 1A 10P (vi-)
-tap 1P 4A
+tap 1U 4A
 daa1 2P 1U 3U
 draa2 2P 4U
 dh.r.s 1U 5P
@@ -173,11 +173,12 @@ value voices_of_gana g root = match g with
  [ 1 -> match root with
         [ ".r" | "k.r.s" | "cur" | "tap" | "budh#1" | "van" | "v.r#1" | "su#2"
         | "suu#1" 
-            -> Para (* but ".r" Atma for pv sam \Pan{1,3,29} *)  
+            -> Para 
         | "i" | "gha.t.t" | "ghuur.n" | ".damb" | "bhra.mz" | "mid" | "mok.s"
         | "lok" | "svid#2" 
             -> Atma
-        | "i.s#1" | "j.rr" | "daa#1" | "dh.r.s" | "as#2" | "kuc" 
+        | "i.s#1" | ".r" (* ".r" Atma for pv sam \Pan{1,3,29} also "tap" *)  
+        | "j.rr" | "tap" | "daa#1" | "dh.r.s" | "as#2" | "kuc" 
         | "m.rj" | "m.rd#1" | "rud#1" | "stambh" 
             -> Ubha
         | "kliiba" -> Atma (* denominative verb *)
@@ -237,12 +238,12 @@ value voices_of_gana g root = match g with
 ;
 
 (* Refining with potential preverb *)
-value voices_of_pv upasarga gana = fun (* gana only used for "tap" "i" *)
+value voices_of_pv upasarga gana = fun (* gana only used for "tap" "i" ".r" *)
 (* Paninian requirements *)
-[ "zru" | ".r" | "gam" | "svar" | "vid#1" (* | "praz" *) -> 
+[ "zru" | "gam" | "svar" | "vid#1" (* | "praz" *) -> 
              if upasarga = "sam" then Atma else Para (* \Pan{1,3,29} *)
 (* "praz" used in Atma with aa- but also without pv in epics (MW) *)
-| "car" ->   if upasarga = "sam" then Ubha else Para (* \Pan{1,3,54} *)
+| ".r" | "car" ->   if upasarga = "sam" then Ubha else Para (* \Pan{1,3,54} *)
 | "viz#1" -> if upasarga = "ni"  then Atma else Para (* \Pan{1,3,17} *)
 | "huu" -> match upasarga with
            [ "ni" | "sam" | "upa" | "vi" -> Atma (* \Pan{1,3,30} *)
diff --git a/ML/verbs.ml b/ML/verbs.ml
index a93f98bc06c208f8626fd446848d57f8ad472ce3..cf4b4c4046c7a0898d3d4961ab47fb79b8a0637f 100644
--- a/ML/verbs.ml
+++ b/ML/verbs.ml
@@ -4865,9 +4865,10 @@ value compute_present_system entry rstem gana pada third =
          match voices_of_gana gana entry with
          [ Para -> (* active only *) if pada then
              compute_thematic_active gana Primary stem entry third
-                                     else if entry = ".r" then (* for sam- *)
-             compute_thematic_middle gana Primary stem entry third
-             else emit_warning ("Unexpected middle form: " ^ entry) 
+             (*                      else if entry = ".r" 
+                                          || entry = "tap" then (* for sam- *)
+             compute_thematic_middle gana Primary stem entry third  *)
+             else emit_warning ("Unexpected middle form: " ^ entry)
          | Atma -> (* middle only *)  
              if padam then emit_warning ("Unexpected active form: " ^ entry) 
              else compute_thematic_middle gana Primary stem entry third
diff --git a/ML/version.ml b/ML/version.ml
index d97e21f96dda797ff952dedecd5ba133ce29b505..aa324433184d04dc4ac1c1fd40c72c468daa6d57 100644
--- a/ML/version.ml
+++ b/ML/version.ml
@@ -8,4 +8,4 @@
 (**************************************************************************)
 
 (* Generated by make version - see main Makefile *)
-value version="3.08" and version_date="2018-07-07";
+value version="3.08" and version_date="2018-07-22";
diff --git a/SETUP/version.txt b/SETUP/version.txt
index c08380fb59cb95dd897a18a5a544a33128b48156..db55af2d59ab2f16d66ed8c185453ec1beebaddb 100644
--- a/SETUP/version.txt
+++ b/SETUP/version.txt
@@ -1,2 +1,2 @@
 VERSION='3.08'
-DATE='2018-07-07'
+DATE='2018-07-22'
diff --git a/SITE/manual.html b/SITE/manual.html
index 1abb78ac8d522a7b6b10404845fd8e9756d97142..feebdb3dbeead77766d8720d6cff987b4bc54e26 100644
--- a/SITE/manual.html
+++ b/SITE/manual.html
@@ -50,7 +50,7 @@ published recently as
 <a href="http://jlm.ipipan.waw.pl/index.php/JLM/article/view/108/140">Design and
 analysis of a lean interface for Sanskrit corpus annotation</a>.
 <p>
-Written on April 17th 2018, for Sanskrit Engine Version 3.06.
+Written on July 22nd 2018, for Sanskrit Engine Version 3.08.
 
 <h2 class="b2" id="tour">First approach to using the Sanskrit Heritage engine</h2>
 
@@ -139,10 +139,11 @@ stem <i>āptavya</i> and form <i>āptavyam</i> may be derived using the
 conjugation cum declension tools.
 <p>
 
-Here we are lucky - the correct word analysis (<i>padapāṭha</i>) of the sentence is
-obtainable as the sequence of all the words in the upper line of the diagram.
-Some have no competitor, they are checked blue.
-The ambiguous segments have two marks, a green check sign and a red cross sign.
+Here we are lucky - the correct word analysis (<i>padapāṭha</i>) of the
+sentence is obtainable as the sequence of all the words in the upper line
+of the diagram. Some have no competitor, they are checked blue.
+The remaining ambiguous segments have two marks, a green check sign
+and a red cross sign.
 In two clicks on the green upper signs you get the intended segmentation.
 <p>