diff --git a/README.md b/README.md
index b5549a3..5cc1cac 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,10 @@ v1.6.0 - 21 February 2016 - The code now has three commentaries mAdhavIyadhAtuvR
 
 v1.6.1 - 12 March 2016 - The code is tested for representative verbs from Siddhantakumudi (round 2) and suspect verb forms are corrected.
 
+v1.7.0 - 13 March 2016 - Decide which sUtra bars which sUtras.
+
+v1.8.0 - 20 March 2016 - Added bhAvavAcya, karmavAcya, karmakartRvAcya, Nijanta and yaGanta forms.
+
 # For understanding the code
 
 Read [this](https://github.com/drdhaval2785/SanskritVerb/Documentations/blob/master/understandcode.md)
diff --git a/panini.php b/panini.php
index 0fc6a3b..667f966 100644
--- a/panini.php
+++ b/panini.php
@@ -2,7 +2,7 @@
  /* This code is developed by Dr. Dhaval Patel (drdhaval2785@gmail.com) of www.sanskritworld.in and Ms. Sivakumari Katuri.
   * Layout assistance by Mr Marcis Gasuns.
   * Available under GNU licence.
-  * Version 1.7.0 date 13 March 2016
+  * Version 1.8.0 date 20 March 2016
   * The latest source code is available at https://github.com/drdhaval2785/SanskritVerb .
   * Acknowledgements: The base book for coding has been Astadhyayi sahajabodha of Dr. Pushpa Dikshit, published by Pratibha Prakashan, Delhi.
   * I extend my heartfelt thanks to Ananda Loponen for the code to convert devanagari and various sanskrit transliterations. That can be accessed at http://www.ingmardeboer.nl/php/diCrunch.php?act=help.
@@ -2487,6 +2487,16 @@
 		$abhyAsa=1;
 		$abhyasta=1;
 	}
+	if (arr($text,'/ya[+]Sap[+]/'))
+	{
+		storedata('1.3.3','pa',0);
+		storedata('1.3.8','pa',0);
+		$text = one(array("ya+Sap+"),array("ya+a+"),0);
+		storedata('1.3.9','sa',0);
+		$text = one(array("ya+a+"),array("ya+"),0);
+		storedata('6.1.97','sa',0);
+	}
+
 	$yaGverb = change('/[+][^+]*$/','');
 	$verb_without_anubandha = str_replace('+','',$yaGverb[0]);
 	$text = one($yaGverb,array($verb_without_anubandha),0);
diff --git a/scripts/function.php b/scripts/function.php
index 1bbc48f..10b3e08 100644
--- a/scripts/function.php
+++ b/scripts/function.php
@@ -2,7 +2,7 @@
 /* This code is developed by Dr. Dhaval Patel (drdhaval2785@gmail.com) of www.sanskritworld.in and Ms. Sivakumari Katuri.
   * Layout assistance by Mr Marcis Gasuns.
   * Available under GNU licence.
-  * Version 1.7.0 date 13 March 2016
+  * Version 1.8.0 date 20 March 2016
   * The latest source code is available at https://github.com/drdhaval2785/SanskritVerb
   * For setup, copy and paste tiGanta.html, tiGanta.php, and scripts folder to your localhost and server and run tiGanta.html.
   * tiGanta.html is the frontend for the code.
diff --git a/tiGanta.html b/tiGanta.html
index ebfab8d..dcdad5e 100644
--- a/tiGanta.html
+++ b/tiGanta.html
@@ -66,13 +66,13 @@
 <input type="radio" name="sanAdi" value="kyaN">क्यङ्‌
 <input type="radio" name="sanAdi" value="kvip">क्विप्‌-->
 <input type="radio" name="sanAdi" value="Ric">णिच्‌
-<input type="radio" name="sanAdi" value="yaN" checked>यङ्‌
+<input type="radio" name="sanAdi" value="yaN">यङ्‌
 <!--<input type="radio" name="sanAdi" value="RiN">णिङ्‌
 <input type="radio" name="sanAdi" value="yak">यक्‌
 <input type="radio" name="sanAdi" value="Aya">आय
 <input type="radio" name="sanAdi" value="IyaN">ईयङ्‌
 <input type="radio" name="sanAdi" value="aN">अङ्‌-->
-<input type="radio" name="sanAdi" value="">None
+<input type="radio" name="sanAdi" value="" checked>None
 
 <!--<input type="hidden" name="sanAdi" value="" checked>-->
 <input type="hidden" name="frontend" value="1" checked>