diff --git a/README.md b/README.md
index 2de28363..65b1c16c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Cost Benefit Projection (3.3.0)
+# Cost Benefit Projection (3.3.2)
 
 This is a [Joomla 3.x] (http://www.joomla.org/) component.
 
@@ -22,12 +22,12 @@ max_input_vars = 5000
 + *Author*: [Llewellyn van der Merwe] (mailto:llewellyn@vdm.io)
 + *Name*: [Cost Benefit Projection] (https://www.staffhealthcbp.com/)
 + *First Build*: 15th June, 2012
-+ *Last Build*: 14th February, 2016
-+ *Version*: 3.3.0
++ *Last Build*: 16th February, 2016
++ *Version*: 3.3.2
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **82830**
-+ *File count*: **546**
++ *Line count*: **82915**
++ *File count*: **547**
 + *Folder count*: **101**
 
 > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder).
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css
index b49068a2..2e40d5ad 100644
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		admin.css
diff --git a/admin/assets/css/causerisk.css b/admin/assets/css/causerisk.css
index 7289d76b..a83cb703 100644
--- a/admin/assets/css/causerisk.css
+++ b/admin/assets/css/causerisk.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.css
diff --git a/admin/assets/css/causesrisks.css b/admin/assets/css/causesrisks.css
index f2e411f9..09ba965d 100644
--- a/admin/assets/css/causesrisks.css
+++ b/admin/assets/css/causesrisks.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causesrisks.css
diff --git a/admin/assets/css/combinedresults.css b/admin/assets/css/combinedresults.css
index e03320ad..3db80eaf 100644
--- a/admin/assets/css/combinedresults.css
+++ b/admin/assets/css/combinedresults.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		combinedresults.css
diff --git a/admin/assets/css/companies.css b/admin/assets/css/companies.css
index 9daa068d..9193d477 100644
--- a/admin/assets/css/companies.css
+++ b/admin/assets/css/companies.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies.css
diff --git a/admin/assets/css/company.css b/admin/assets/css/company.css
index 11886af7..4a016abd 100644
--- a/admin/assets/css/company.css
+++ b/admin/assets/css/company.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.css
diff --git a/admin/assets/css/companyresults.css b/admin/assets/css/companyresults.css
index 51258e42..64b2a10d 100644
--- a/admin/assets/css/companyresults.css
+++ b/admin/assets/css/companyresults.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companyresults.css
diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css
index 60f2c60c..471581ec 100644
--- a/admin/assets/css/countries.css
+++ b/admin/assets/css/countries.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		countries.css
diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css
index 3561484c..4fa8c781 100644
--- a/admin/assets/css/country.css
+++ b/admin/assets/css/country.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		country.css
diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css
index 68806968..f3706813 100644
--- a/admin/assets/css/currencies.css
+++ b/admin/assets/css/currencies.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currencies.css
diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css
index acb73007..f1811dc1 100644
--- a/admin/assets/css/currency.css
+++ b/admin/assets/css/currency.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.css
diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css
index d2c51b2b..d9908a4d 100644
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		dashboard.css
diff --git a/admin/assets/css/health_data.css b/admin/assets/css/health_data.css
index 17f11f1b..85d26add 100644
--- a/admin/assets/css/health_data.css
+++ b/admin/assets/css/health_data.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data.css
diff --git a/admin/assets/css/health_data_sets.css b/admin/assets/css/health_data_sets.css
index 8181f664..5b94a8c1 100644
--- a/admin/assets/css/health_data_sets.css
+++ b/admin/assets/css/health_data_sets.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_sets.css
diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css
index 75328784..ad1d05ad 100644
--- a/admin/assets/css/help_document.css
+++ b/admin/assets/css/help_document.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_document.css
diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css
index d2fb5dff..1ac154d6 100644
--- a/admin/assets/css/help_documents.css
+++ b/admin/assets/css/help_documents.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_documents.css
diff --git a/admin/assets/css/intervention.css b/admin/assets/css/intervention.css
index 02eefc77..690bdd0c 100644
--- a/admin/assets/css/intervention.css
+++ b/admin/assets/css/intervention.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.css
diff --git a/admin/assets/css/interventions.css b/admin/assets/css/interventions.css
index 35f24a8f..4cbc1966 100644
--- a/admin/assets/css/interventions.css
+++ b/admin/assets/css/interventions.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions.css
diff --git a/admin/assets/css/scaling_factor.css b/admin/assets/css/scaling_factor.css
index b988cf25..f50b5335 100644
--- a/admin/assets/css/scaling_factor.css
+++ b/admin/assets/css/scaling_factor.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.css
diff --git a/admin/assets/css/scaling_factors.css b/admin/assets/css/scaling_factors.css
index 11bf3f01..f06c1de4 100644
--- a/admin/assets/css/scaling_factors.css
+++ b/admin/assets/css/scaling_factors.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors.css
diff --git a/admin/assets/css/service_provider.css b/admin/assets/css/service_provider.css
index c6e8c580..cf79c485 100644
--- a/admin/assets/css/service_provider.css
+++ b/admin/assets/css/service_provider.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_provider.css
diff --git a/admin/assets/css/service_providers.css b/admin/assets/css/service_providers.css
index 2c494856..fb80694b 100644
--- a/admin/assets/css/service_providers.css
+++ b/admin/assets/css/service_providers.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_providers.css
diff --git a/admin/controller.php b/admin/controller.php
index 18bc41b9..47f927cf 100644
--- a/admin/controller.php
+++ b/admin/controller.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		controller.php
diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php
index f32c6838..29b7b858 100644
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		ajax.json.php
diff --git a/admin/controllers/causerisk.php b/admin/controllers/causerisk.php
index 5d51c5f6..4fe5206c 100644
--- a/admin/controllers/causerisk.php
+++ b/admin/controllers/causerisk.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.php
diff --git a/admin/controllers/causesrisks.php b/admin/controllers/causesrisks.php
index f1457b53..a20ee8cb 100644
--- a/admin/controllers/causesrisks.php
+++ b/admin/controllers/causesrisks.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causesrisks.php
diff --git a/admin/controllers/combinedresults.php b/admin/controllers/combinedresults.php
index e04c0d59..56180896 100644
--- a/admin/controllers/combinedresults.php
+++ b/admin/controllers/combinedresults.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		combinedresults.php
diff --git a/admin/controllers/companies.php b/admin/controllers/companies.php
index 33e0d8cf..59289323 100644
--- a/admin/controllers/companies.php
+++ b/admin/controllers/companies.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies.php
diff --git a/admin/controllers/company.php b/admin/controllers/company.php
index a6282ce6..afc05c10 100644
--- a/admin/controllers/company.php
+++ b/admin/controllers/company.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.php
diff --git a/admin/controllers/companyresults.php b/admin/controllers/companyresults.php
index df9c165a..ede873b3 100644
--- a/admin/controllers/companyresults.php
+++ b/admin/controllers/companyresults.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companyresults.php
diff --git a/admin/controllers/costbenefitprojection.php b/admin/controllers/costbenefitprojection.php
index 2e163687..0625328a 100644
--- a/admin/controllers/costbenefitprojection.php
+++ b/admin/controllers/costbenefitprojection.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php
index bb5f7edc..e0e26ae4 100644
--- a/admin/controllers/countries.php
+++ b/admin/controllers/countries.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		countries.php
diff --git a/admin/controllers/country.php b/admin/controllers/country.php
index 47390da1..ba72ceff 100644
--- a/admin/controllers/country.php
+++ b/admin/controllers/country.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		country.php
diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php
index 3cdf914a..6ded0bd0 100644
--- a/admin/controllers/currencies.php
+++ b/admin/controllers/currencies.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currencies.php
diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php
index aeecfd27..77796da0 100644
--- a/admin/controllers/currency.php
+++ b/admin/controllers/currency.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.php
diff --git a/admin/controllers/health_data.php b/admin/controllers/health_data.php
index 2b71f9bc..d5d756c2 100644
--- a/admin/controllers/health_data.php
+++ b/admin/controllers/health_data.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data.php
diff --git a/admin/controllers/health_data_sets.php b/admin/controllers/health_data_sets.php
index 1c0e0684..04e25502 100644
--- a/admin/controllers/health_data_sets.php
+++ b/admin/controllers/health_data_sets.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_sets.php
diff --git a/admin/controllers/help.php b/admin/controllers/help.php
index eca47671..81c14c2d 100644
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help.php
diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php
index 4ee8a4ba..cd354b09 100644
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_document.php
diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php
index 4d93b017..e660b1b3 100644
--- a/admin/controllers/help_documents.php
+++ b/admin/controllers/help_documents.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_documents.php
diff --git a/admin/controllers/import.php b/admin/controllers/import.php
index c8505300..5aba24ad 100644
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		import.php
diff --git a/admin/controllers/intervention.php b/admin/controllers/intervention.php
index 2bf7a3e5..6162e30d 100644
--- a/admin/controllers/intervention.php
+++ b/admin/controllers/intervention.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.php
diff --git a/admin/controllers/interventions.php b/admin/controllers/interventions.php
index 99fb5ead..aeb87bc9 100644
--- a/admin/controllers/interventions.php
+++ b/admin/controllers/interventions.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions.php
diff --git a/admin/controllers/scaling_factor.php b/admin/controllers/scaling_factor.php
index 661de7d4..35c9f069 100644
--- a/admin/controllers/scaling_factor.php
+++ b/admin/controllers/scaling_factor.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.php
diff --git a/admin/controllers/scaling_factors.php b/admin/controllers/scaling_factors.php
index dffb5734..8962b8e2 100644
--- a/admin/controllers/scaling_factors.php
+++ b/admin/controllers/scaling_factors.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors.php
diff --git a/admin/controllers/service_provider.php b/admin/controllers/service_provider.php
index 462fe6ed..3fa3819c 100644
--- a/admin/controllers/service_provider.php
+++ b/admin/controllers/service_provider.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_provider.php
diff --git a/admin/controllers/service_providers.php b/admin/controllers/service_providers.php
index 49a16acb..62fc9b9a 100644
--- a/admin/controllers/service_providers.php
+++ b/admin/controllers/service_providers.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_providers.php
diff --git a/admin/costbenefitprojection.php b/admin/costbenefitprojection.php
index 2a0e753a..bc32957f 100644
--- a/admin/costbenefitprojection.php
+++ b/admin/costbenefitprojection.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
diff --git a/admin/helpers/costbenefitprojection.php b/admin/helpers/costbenefitprojection.php
index 1fee2a3a..735a2574 100644
--- a/admin/helpers/costbenefitprojection.php
+++ b/admin/helpers/costbenefitprojection.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php
index c73cd2ba..5cef09b6 100644
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		batch_.php
diff --git a/admin/helpers/sum.php b/admin/helpers/sum.php
index 669cbc4c..1d1d8f67 100644
--- a/admin/helpers/sum.php
+++ b/admin/helpers/sum.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		sum.php
@@ -88,7 +88,7 @@ class Sum
 			$jsonObjects = array('percentmale','percentfemale','country_percentmale','country_percentfemale','country_maledeath','country_femaledeath','country_maleyld','country_femaleyld');
 			$removeArray = array(
 				'asset_id','not_required','published','created_by','country_created_by','country_created','country_version','country_hits','country_ordering',
-				'modified_by','country_asset_id','created','modified','version','hits','ordering','country_published','country_modified_by','country_modified',
+				'modified_by','country_asset_id','created','modified','version','hits','ordering','country_published','country_modified_by','country_modified','country_maledeath','country_femaledeath','country_maleyld','country_femaleyld',
 				'idCompanyScaling_factorC',$cKey.'CountryHealth_dataB',$cKey.'CountryHealth_dataBB','causesrisksIdCauseriskG','causesrisksIdCauseriskGG','idCompanyInterventionD','countryCountryInterventionDD','idCountryInterventionDD');
 			foreach ($jsonObjects as $jsonObject)
 			{
@@ -147,17 +147,24 @@ class Sum
 				}
 			}
 			// country totals sorting
-			$countrySort = array('country_maledeath','country_femaledeath','country_maleyld','country_femaleyld');
-			foreach ($countrySort as $sort)
+			$countrySort = array(
+				'country_maledeath' => array('gender' => 'male', 'type' => 'death'),
+				'country_femaledeath' => array('gender' => 'female', 'type' => 'death'),
+				'country_maleyld' => array('gender' => 'male', 'type' => 'yld'),
+				'country_femaleyld' => array('gender' => 'female', 'type' => 'yld'));
+			$this->company->country_yld = 0;
+			$this->company->country_death = 0;
+			foreach ($countrySort as $sort => $tar)
 			{
 				if (isset($this->company->$sort) && CostbenefitprojectionHelper::checkArray($this->company->$sort))
-				{
-					$bucket = array();
+				{ 
 					foreach ($this->company->$sort as $value)
 					{
-						$bucket[$value['age'].'_'.$value['year']] = $value['number'];
+						if ($this->company->datayear == $value['year'])
+						{
+							$this->company->{'country_'.$tar['type']} += $value['number'];
+						}
 					}
-					$this->company->$sort = $bucket;
 				}
 			}
 			// country health totals sorting
@@ -478,6 +485,8 @@ class Sum
 			// set global totals day_lost
 			$this->totals['total_days_lost_scaled']					= 0;
 			$this->totals['total_days_lost_unscaled']				= 0;
+			// set global totals estimated_burden
+			$this->totals['total_estimated_burden']					= 0;
 			// work with each gender
 			foreach($this->genders as $gender => $genders)
 			{
@@ -509,7 +518,7 @@ class Sum
 		
 			// set morbidity_raw
 			foreach($this->company->causesrisks as $id)
-			{				
+			{
 				// work with each gender
 				foreach($this->genders as $gender => $genders)
 				{
@@ -519,14 +528,38 @@ class Sum
 					{
 						if (isset($this->company->{'percent'.$gender}[$age]))
 						{
-							$this->items[$id]->$gender->$age = new stdClass();
 							// set each gender and age group
+							$this->items[$id]->$gender->$age = new stdClass();
+							// continue only if we have a value
+							$goodToGo = true;
 							// fix missing values
 							if(!isset($this->company->healthData[$id]->{$gender.'yld'}[$age]))
 							{
 								$this->company->healthData[$id]->{$gender.'yld'}[$age] = 0;
+								$goodToGo = false;
 							}
-							$this->items[$id]->$gender->$age->yld			= $this->company->healthData[$id]->{$gender.'yld'}[$age];
+							// set the YLD
+							$this->items[$id]->$gender->$age->yld				= $this->company->healthData[$id]->{$gender.'yld'}[$age];
+							if ($goodToGo)
+							{
+								// set the estimated_burden of this age group & gender & cause
+								$this->items[$id]->$gender->$age->estimated_burden	= ($this->items[$id]->$gender->$age->yld / $this->company->country_yld)*100;
+								if (!isset($this->items[$id]->subtotal_estimated_burden))
+								{
+									$this->items[$id]->subtotal_estimated_burden 	= $this->items[$id]->$gender->$age->estimated_burden;
+								}
+								else
+								{
+									$this->items[$id]->subtotal_estimated_burden 	+= $this->items[$id]->$gender->$age->estimated_burden;	
+								}
+								// set the totals for estimated_burden
+								$this->totals['total_estimated_burden']			= $this->totals['total_estimated_burden'] + $this->items[$id]->$gender->$age->estimated_burden;
+							}
+							else
+							{
+								$this->items[$id]->subtotal_estimated_burden = 0;
+							}
+							// set the morbidity raw
 							$this->items[$id]->$gender->$age->morbidity_raw 	= ( $this->company->healthData[$id]->{$gender.'yld'}[$age]/100000 ) 
 														* $this->company->$genders * ($this->company->{'percent'.$gender}[$age]/100);
 							// set total for morbidity_raw
@@ -536,6 +569,20 @@ class Sum
 					}
 				}
 			}
+			// check estimated burden
+			if (100 < $this->totals['total_estimated_burden'])
+			{
+				foreach ($this->items as $item)
+				{
+					if (isset($item->subtotal_estimated_burden) && 0 != $this->items[$id]->subtotal_estimated_burden)
+					{
+						// adjust the subtotal to 100 %
+						$item->subtotal_estimated_burden = ($item->subtotal_estimated_burden * 100) / $this->totals['total_estimated_burden'];
+					}
+				}
+				// bring down the estimate to 100 %
+				$this->totals['total_estimated_burden'] = 100;
+			}
 			// set morbidity_unscaled & morbidity_interim
 			foreach($this->company->causesrisks as $id)
 			{
diff --git a/admin/helpers/sumcombine.php b/admin/helpers/sumcombine.php
index 75cc463d..c4c7ef34 100644
--- a/admin/helpers/sumcombine.php
+++ b/admin/helpers/sumcombine.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		sumcombine.php
diff --git a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini
index b1d276c7..2257148e 100644
--- a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini
+++ b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini
@@ -1142,6 +1142,7 @@ COM_COSTBENEFITPROJECTION_NO_CAUSERISK_SELECTED="No Cause/Risk Selected"
 COM_COSTBENEFITPROJECTION_NO_DISEASERISK_SELECTED="No Disease/Risk Selected"
 COM_COSTBENEFITPROJECTION_NO_INTERVENTION_SELECTED="No Intervention Selected"
 COM_COSTBENEFITPROJECTION_NUMBER_OF_WORK_DAYS_LOST="Number of work days lost"
+COM_COSTBENEFITPROJECTION_PERCENT_OF_ESTIMATED_BURDEN="Percent of Estimated Burden"
 COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_COST="Percent of Total Cost"
 COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_DAYS_LOST="Percent of Total Days Lost"
 COM_COSTBENEFITPROJECTION_PLEASE_WAIT="please wait"
diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php
index ef9a921a..7efc51d0 100644
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		batchselection.php
diff --git a/admin/layouts/causerisk/details_above.php b/admin/layouts/causerisk/details_above.php
index bcc75460..9fc5968a 100644
--- a/admin/layouts/causerisk/details_above.php
+++ b/admin/layouts/causerisk/details_above.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/causerisk/details_left.php b/admin/layouts/causerisk/details_left.php
index e27ef6f3..07807a4b 100644
--- a/admin/layouts/causerisk/details_left.php
+++ b/admin/layouts/causerisk/details_left.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/admin/layouts/causerisk/publishing.php b/admin/layouts/causerisk/publishing.php
index 7a72e83a..a2b6b2e9 100644
--- a/admin/layouts/causerisk/publishing.php
+++ b/admin/layouts/causerisk/publishing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/causerisk/publlshing.php b/admin/layouts/causerisk/publlshing.php
index 8d441276..9fb584ab 100644
--- a/admin/layouts/causerisk/publlshing.php
+++ b/admin/layouts/causerisk/publlshing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/company/age_groups_percentages_fullwidth.php b/admin/layouts/company/age_groups_percentages_fullwidth.php
index 8e096960..cf788d00 100644
--- a/admin/layouts/company/age_groups_percentages_fullwidth.php
+++ b/admin/layouts/company/age_groups_percentages_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_fullwidth.php
diff --git a/admin/layouts/company/age_groups_percentages_left.php b/admin/layouts/company/age_groups_percentages_left.php
index c5fbf84b..afe2d8ba 100644
--- a/admin/layouts/company/age_groups_percentages_left.php
+++ b/admin/layouts/company/age_groups_percentages_left.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_left.php
diff --git a/admin/layouts/company/age_groups_percentages_right.php b/admin/layouts/company/age_groups_percentages_right.php
index 92ca5dee..873fe0e6 100644
--- a/admin/layouts/company/age_groups_percentages_right.php
+++ b/admin/layouts/company/age_groups_percentages_right.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_right.php
diff --git a/admin/layouts/company/causerisk_selection_fullwidth.php b/admin/layouts/company/causerisk_selection_fullwidth.php
index 7353b330..2194a740 100644
--- a/admin/layouts/company/causerisk_selection_fullwidth.php
+++ b/admin/layouts/company/causerisk_selection_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk_selection_fullwidth.php
diff --git a/admin/layouts/company/details_above.php b/admin/layouts/company/details_above.php
index 50bd145c..ee6c8f58 100644
--- a/admin/layouts/company/details_above.php
+++ b/admin/layouts/company/details_above.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/company/details_left.php b/admin/layouts/company/details_left.php
index d44b7696..a8976882 100644
--- a/admin/layouts/company/details_left.php
+++ b/admin/layouts/company/details_left.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/admin/layouts/company/details_right.php b/admin/layouts/company/details_right.php
index da23cf01..d1e21191 100644
--- a/admin/layouts/company/details_right.php
+++ b/admin/layouts/company/details_right.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/admin/layouts/company/details_under.php b/admin/layouts/company/details_under.php
index 5ee62174..e3abec90 100644
--- a/admin/layouts/company/details_under.php
+++ b/admin/layouts/company/details_under.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_under.php
diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php
index 1f6e0498..bf0ad2d9 100644
--- a/admin/layouts/company/interventions_fullwidth.php
+++ b/admin/layouts/company/interventions_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions_fullwidth.php
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->kqlinterventions;
+$items	= $displayData->eqzinterventions;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit";
diff --git a/admin/layouts/company/publishing.php b/admin/layouts/company/publishing.php
index 7a72e83a..a2b6b2e9 100644
--- a/admin/layouts/company/publishing.php
+++ b/admin/layouts/company/publishing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/company/publlshing.php b/admin/layouts/company/publlshing.php
index 8d441276..9fb584ab 100644
--- a/admin/layouts/company/publlshing.php
+++ b/admin/layouts/company/publlshing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/company/scaling_factors_fullwidth.php b/admin/layouts/company/scaling_factors_fullwidth.php
index fb593e66..276cc8f5 100644
--- a/admin/layouts/company/scaling_factors_fullwidth.php
+++ b/admin/layouts/company/scaling_factors_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors_fullwidth.php
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->onzscaling_factors;
+$items	= $displayData->rxtscaling_factors;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=scaling_factors&task=scaling_factor.edit";
diff --git a/admin/layouts/country/age_groups_percentages_left.php b/admin/layouts/country/age_groups_percentages_left.php
index c5fbf84b..afe2d8ba 100644
--- a/admin/layouts/country/age_groups_percentages_left.php
+++ b/admin/layouts/country/age_groups_percentages_left.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_left.php
diff --git a/admin/layouts/country/age_groups_percentages_right.php b/admin/layouts/country/age_groups_percentages_right.php
index 92ca5dee..873fe0e6 100644
--- a/admin/layouts/country/age_groups_percentages_right.php
+++ b/admin/layouts/country/age_groups_percentages_right.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_right.php
diff --git a/admin/layouts/country/causerisk_selection_fullwidth.php b/admin/layouts/country/causerisk_selection_fullwidth.php
index f7ce093c..44727468 100644
--- a/admin/layouts/country/causerisk_selection_fullwidth.php
+++ b/admin/layouts/country/causerisk_selection_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk_selection_fullwidth.php
diff --git a/admin/layouts/country/companies_fullwidth.php b/admin/layouts/country/companies_fullwidth.php
index cd145a54..f04dfc76 100644
--- a/admin/layouts/country/companies_fullwidth.php
+++ b/admin/layouts/country/companies_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies_fullwidth.php
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->nnfcompanies;
+$items	= $displayData->juzcompanies;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=companies&task=company.edit";
diff --git a/admin/layouts/country/details_above.php b/admin/layouts/country/details_above.php
index 9f8ad780..96c7e77e 100644
--- a/admin/layouts/country/details_above.php
+++ b/admin/layouts/country/details_above.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/country/details_left.php b/admin/layouts/country/details_left.php
index efa2670e..5361d4ba 100644
--- a/admin/layouts/country/details_left.php
+++ b/admin/layouts/country/details_left.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/admin/layouts/country/details_right.php b/admin/layouts/country/details_right.php
index f14ed755..3a17ef73 100644
--- a/admin/layouts/country/details_right.php
+++ b/admin/layouts/country/details_right.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/admin/layouts/country/health_data_totals_left.php b/admin/layouts/country/health_data_totals_left.php
index cd0ad786..a162bb8c 100644
--- a/admin/layouts/country/health_data_totals_left.php
+++ b/admin/layouts/country/health_data_totals_left.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_totals_left.php
diff --git a/admin/layouts/country/health_data_totals_right.php b/admin/layouts/country/health_data_totals_right.php
index 8991c4cb..12232d29 100644
--- a/admin/layouts/country/health_data_totals_right.php
+++ b/admin/layouts/country/health_data_totals_right.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_totals_right.php
diff --git a/admin/layouts/country/interventions_fullwidth.php b/admin/layouts/country/interventions_fullwidth.php
index 0426d559..c32dc43e 100644
--- a/admin/layouts/country/interventions_fullwidth.php
+++ b/admin/layouts/country/interventions_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions_fullwidth.php
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->fyzinterventions;
+$items	= $displayData->tdlinterventions;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit";
diff --git a/admin/layouts/country/public_details_fullwidth.php b/admin/layouts/country/public_details_fullwidth.php
index 40439325..142762aa 100644
--- a/admin/layouts/country/public_details_fullwidth.php
+++ b/admin/layouts/country/public_details_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		public_details_fullwidth.php
diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php
index 7a72e83a..a2b6b2e9 100644
--- a/admin/layouts/country/publishing.php
+++ b/admin/layouts/country/publishing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php
index 8d441276..9fb584ab 100644
--- a/admin/layouts/country/publlshing.php
+++ b/admin/layouts/country/publlshing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/country/service_providers_fullwidth.php b/admin/layouts/country/service_providers_fullwidth.php
index 7f90880d..a52e83a9 100644
--- a/admin/layouts/country/service_providers_fullwidth.php
+++ b/admin/layouts/country/service_providers_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_providers_fullwidth.php
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->mjwservice_providers;
+$items	= $displayData->olaservice_providers;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=service_providers&task=service_provider.edit";
diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php
index 29f29f0e..ec3cf0ee 100644
--- a/admin/layouts/currency/details_above.php
+++ b/admin/layouts/currency/details_above.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php
index 4e2af95b..66a22cf7 100644
--- a/admin/layouts/currency/details_left.php
+++ b/admin/layouts/currency/details_left.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php
index 66a99ae0..dff3aeb5 100644
--- a/admin/layouts/currency/details_right.php
+++ b/admin/layouts/currency/details_right.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php
index 7a72e83a..a2b6b2e9 100644
--- a/admin/layouts/currency/publishing.php
+++ b/admin/layouts/currency/publishing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php
index 8d441276..9fb584ab 100644
--- a/admin/layouts/currency/publlshing.php
+++ b/admin/layouts/currency/publlshing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/databreakdownmalefemale.php b/admin/layouts/databreakdownmalefemale.php
index ba510d79..ea88e191 100644
--- a/admin/layouts/databreakdownmalefemale.php
+++ b/admin/layouts/databreakdownmalefemale.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		databreakdownmalefemale.php
diff --git a/admin/layouts/health_data/details_above.php b/admin/layouts/health_data/details_above.php
index 61ee4772..163d7197 100644
--- a/admin/layouts/health_data/details_above.php
+++ b/admin/layouts/health_data/details_above.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/health_data/details_left.php b/admin/layouts/health_data/details_left.php
index ce877573..27a967c4 100644
--- a/admin/layouts/health_data/details_left.php
+++ b/admin/layouts/health_data/details_left.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/admin/layouts/health_data/details_right.php b/admin/layouts/health_data/details_right.php
index afb2c854..da3e8cc5 100644
--- a/admin/layouts/health_data/details_right.php
+++ b/admin/layouts/health_data/details_right.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/admin/layouts/health_data/details_rightside.php b/admin/layouts/health_data/details_rightside.php
index 9c0a99ac..2f017601 100644
--- a/admin/layouts/health_data/details_rightside.php
+++ b/admin/layouts/health_data/details_rightside.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_rightside.php
diff --git a/admin/layouts/health_data/publishing.php b/admin/layouts/health_data/publishing.php
index 7a72e83a..a2b6b2e9 100644
--- a/admin/layouts/health_data/publishing.php
+++ b/admin/layouts/health_data/publishing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/health_data/publlshing.php b/admin/layouts/health_data/publlshing.php
index 8d441276..9fb584ab 100644
--- a/admin/layouts/health_data/publlshing.php
+++ b/admin/layouts/health_data/publlshing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php
index 2d9583b2..5df0b98c 100644
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php
index cadebae5..478895f5 100644
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php
index d1e952ef..aa1f492f 100644
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php
index 95899d68..f1303951 100644
--- a/admin/layouts/help_document/details_right.php
+++ b/admin/layouts/help_document/details_right.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php
index 5ee62174..e3abec90 100644
--- a/admin/layouts/help_document/details_under.php
+++ b/admin/layouts/help_document/details_under.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_under.php
diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php
index 7a72e83a..a2b6b2e9 100644
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php
index df96a073..6a0d53f8 100644
--- a/admin/layouts/help_document/publlshing.php
+++ b/admin/layouts/help_document/publlshing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/intervention/details_above.php b/admin/layouts/intervention/details_above.php
index 95a12048..07eefa0b 100644
--- a/admin/layouts/intervention/details_above.php
+++ b/admin/layouts/intervention/details_above.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/intervention/details_fullwidth.php b/admin/layouts/intervention/details_fullwidth.php
index 007f669f..f7e77c71 100644
--- a/admin/layouts/intervention/details_fullwidth.php
+++ b/admin/layouts/intervention/details_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/intervention/details_under.php b/admin/layouts/intervention/details_under.php
index 5ee62174..e3abec90 100644
--- a/admin/layouts/intervention/details_under.php
+++ b/admin/layouts/intervention/details_under.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_under.php
diff --git a/admin/layouts/intervention/publishing.php b/admin/layouts/intervention/publishing.php
index 7a72e83a..a2b6b2e9 100644
--- a/admin/layouts/intervention/publishing.php
+++ b/admin/layouts/intervention/publishing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/intervention/publlshing.php b/admin/layouts/intervention/publlshing.php
index df96a073..6a0d53f8 100644
--- a/admin/layouts/intervention/publlshing.php
+++ b/admin/layouts/intervention/publlshing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/intervention/settings_fullwidth.php b/admin/layouts/intervention/settings_fullwidth.php
index e786c5de..0a8e4c96 100644
--- a/admin/layouts/intervention/settings_fullwidth.php
+++ b/admin/layouts/intervention/settings_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		settings_fullwidth.php
diff --git a/admin/layouts/intervention/settings_left.php b/admin/layouts/intervention/settings_left.php
index dd8a01f9..58621b5c 100644
--- a/admin/layouts/intervention/settings_left.php
+++ b/admin/layouts/intervention/settings_left.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		settings_left.php
diff --git a/admin/layouts/scaling_factor/details_above.php b/admin/layouts/scaling_factor/details_above.php
index 2788a921..c935b3ef 100644
--- a/admin/layouts/scaling_factor/details_above.php
+++ b/admin/layouts/scaling_factor/details_above.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/scaling_factor/details_left.php b/admin/layouts/scaling_factor/details_left.php
index 90a43a94..712b5aa8 100644
--- a/admin/layouts/scaling_factor/details_left.php
+++ b/admin/layouts/scaling_factor/details_left.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/admin/layouts/scaling_factor/details_right.php b/admin/layouts/scaling_factor/details_right.php
index 208fad2d..14d0ae5d 100644
--- a/admin/layouts/scaling_factor/details_right.php
+++ b/admin/layouts/scaling_factor/details_right.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/admin/layouts/scaling_factor/publishing.php b/admin/layouts/scaling_factor/publishing.php
index 7a72e83a..a2b6b2e9 100644
--- a/admin/layouts/scaling_factor/publishing.php
+++ b/admin/layouts/scaling_factor/publishing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/scaling_factor/publlshing.php b/admin/layouts/scaling_factor/publlshing.php
index df96a073..6a0d53f8 100644
--- a/admin/layouts/scaling_factor/publlshing.php
+++ b/admin/layouts/scaling_factor/publlshing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/layouts/service_provider/companies_fullwidth.php b/admin/layouts/service_provider/companies_fullwidth.php
index 9c90b4f4..9f680264 100644
--- a/admin/layouts/service_provider/companies_fullwidth.php
+++ b/admin/layouts/service_provider/companies_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies_fullwidth.php
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->rtncompanies;
+$items	= $displayData->srvcompanies;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=companies&task=company.edit";
diff --git a/admin/layouts/service_provider/details_above.php b/admin/layouts/service_provider/details_above.php
index 253eccc4..e9c7a785 100644
--- a/admin/layouts/service_provider/details_above.php
+++ b/admin/layouts/service_provider/details_above.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/admin/layouts/service_provider/details_fullwidth.php b/admin/layouts/service_provider/details_fullwidth.php
index 4942e5f4..6b668162 100644
--- a/admin/layouts/service_provider/details_fullwidth.php
+++ b/admin/layouts/service_provider/details_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/service_provider/publishing.php b/admin/layouts/service_provider/publishing.php
index 7a72e83a..a2b6b2e9 100644
--- a/admin/layouts/service_provider/publishing.php
+++ b/admin/layouts/service_provider/publishing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/admin/layouts/service_provider/publlshing.php b/admin/layouts/service_provider/publlshing.php
index df96a073..6a0d53f8 100644
--- a/admin/layouts/service_provider/publlshing.php
+++ b/admin/layouts/service_provider/publlshing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index 86bd772f..2d30fe7c 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		ajax.php
diff --git a/admin/models/causerisk.php b/admin/models/causerisk.php
index 0c98e7d6..85b9e171 100644
--- a/admin/models/causerisk.php
+++ b/admin/models/causerisk.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.php
diff --git a/admin/models/causesrisks.php b/admin/models/causesrisks.php
index f14d0e8c..2dcc6f25 100644
--- a/admin/models/causesrisks.php
+++ b/admin/models/causesrisks.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causesrisks.php
diff --git a/admin/models/combinedresults.php b/admin/models/combinedresults.php
index a1390e49..2a2bd963 100644
--- a/admin/models/combinedresults.php
+++ b/admin/models/combinedresults.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		combinedresults.php
diff --git a/admin/models/companies.php b/admin/models/companies.php
index fc3b2e14..a3baf821 100644
--- a/admin/models/companies.php
+++ b/admin/models/companies.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies.php
diff --git a/admin/models/company.php b/admin/models/company.php
index ae18720e..6cf4af0e 100644
--- a/admin/models/company.php
+++ b/admin/models/company.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.php
@@ -154,8 +154,8 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_costbenefitprojection.company');
 			}
 		}
-		$this->companyjniw = $item->id;
-		$this->companylssr = $item->id;
+		$this->companykjdf = $item->id;
+		$this->companydomr = $item->id;
 
 		return $item;
 	}
@@ -165,7 +165,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getOnzscaling_factors()
+	public function getRxtscaling_factors()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -204,15 +204,15 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 		$query->select($db->quoteName('h.name','company_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'h') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('h.id') . ')');
 
-		// Filter by companyjniw global.
-		$companyjniw = $this->companyjniw;
-		if (is_numeric($companyjniw ))
+		// Filter by companykjdf global.
+		$companykjdf = $this->companykjdf;
+		if (is_numeric($companykjdf ))
 		{
-			$query->where('a.company = ' . (int) $companyjniw );
+			$query->where('a.company = ' . (int) $companykjdf );
 		}
-		elseif (is_string($companyjniw))
+		elseif (is_string($companykjdf))
 		{
-			$query->where('a.company = ' . $db->quote($companyjniw));
+			$query->where('a.company = ' . $db->quote($companykjdf));
 		}
 		else
 		{
@@ -255,7 +255,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getKqlinterventions()
+	public function getEqzinterventions()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -290,15 +290,15 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 		$query->select($db->quoteName('g.name','company_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'g') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// Filter by companylssr global.
-		$companylssr = $this->companylssr;
-		if (is_numeric($companylssr ))
+		// Filter by companydomr global.
+		$companydomr = $this->companydomr;
+		if (is_numeric($companydomr ))
 		{
-			$query->where('a.company = ' . (int) $companylssr );
+			$query->where('a.company = ' . (int) $companydomr );
 		}
-		elseif (is_string($companylssr))
+		elseif (is_string($companydomr))
 		{
-			$query->where('a.company = ' . $db->quote($companylssr));
+			$query->where('a.company = ' . $db->quote($companydomr));
 		}
 		else
 		{
@@ -351,7 +351,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert type
-					$item->type = $this->selectionTranslationKqlinterventions($item->type, 'type');
+					$item->type = $this->selectionTranslationEqzinterventions($item->type, 'type');
 				}
 			}
 
@@ -365,7 +365,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationKqlinterventions($value,$name)
+	public function selectionTranslationEqzinterventions($value,$name)
 	{
 		// Array of type language strings
 		if ($name == 'type')
diff --git a/admin/models/companyresults.php b/admin/models/companyresults.php
index 03e8970e..270ac0fa 100644
--- a/admin/models/companyresults.php
+++ b/admin/models/companyresults.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companyresults.php
diff --git a/admin/models/costbenefitprojection.php b/admin/models/costbenefitprojection.php
index c1569c64..930b1b17 100644
--- a/admin/models/costbenefitprojection.php
+++ b/admin/models/costbenefitprojection.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
diff --git a/admin/models/countries.php b/admin/models/countries.php
index 034e647f..737f773a 100644
--- a/admin/models/countries.php
+++ b/admin/models/countries.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		countries.php
diff --git a/admin/models/country.php b/admin/models/country.php
index 9c357120..1f026d39 100644
--- a/admin/models/country.php
+++ b/admin/models/country.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		country.php
@@ -101,9 +101,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_costbenefitprojection.country');
 			}
 		}
-		$this->countryqsqg = $item->id;
-		$this->countryxdji = $item->id;
-		$this->countrypapr = $item->id;
+		$this->countryiypr = $item->id;
+		$this->countryfccn = $item->id;
+		$this->countryvjxo = $item->id;
 
 		return $item;
 	}
@@ -113,7 +113,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getFyzinterventions()
+	public function getTdlinterventions()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -148,15 +148,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 		$query->select($db->quoteName('g.name','company_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'g') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// Filter by countryqsqg global.
-		$countryqsqg = $this->countryqsqg;
-		if (is_numeric($countryqsqg ))
+		// Filter by countryiypr global.
+		$countryiypr = $this->countryiypr;
+		if (is_numeric($countryiypr ))
 		{
-			$query->where('a.country = ' . (int) $countryqsqg );
+			$query->where('a.country = ' . (int) $countryiypr );
 		}
-		elseif (is_string($countryqsqg))
+		elseif (is_string($countryiypr))
 		{
-			$query->where('a.country = ' . $db->quote($countryqsqg));
+			$query->where('a.country = ' . $db->quote($countryiypr));
 		}
 		else
 		{
@@ -209,7 +209,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert type
-					$item->type = $this->selectionTranslationFyzinterventions($item->type, 'type');
+					$item->type = $this->selectionTranslationTdlinterventions($item->type, 'type');
 				}
 			}
 
@@ -223,7 +223,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationFyzinterventions($value,$name)
+	public function selectionTranslationTdlinterventions($value,$name)
 	{
 		// Array of type language strings
 		if ($name == 'type')
@@ -246,7 +246,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getMjwservice_providers()
+	public function getOlaservice_providers()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -285,15 +285,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 		$query->select($db->quoteName('h.name','country_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_country', 'h') . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('h.id') . ')');
 
-		// Filter by countryxdji global.
-		$countryxdji = $this->countryxdji;
-		if (is_numeric($countryxdji ))
+		// Filter by countryfccn global.
+		$countryfccn = $this->countryfccn;
+		if (is_numeric($countryfccn ))
 		{
-			$query->where('a.country = ' . (int) $countryxdji );
+			$query->where('a.country = ' . (int) $countryfccn );
 		}
-		elseif (is_string($countryxdji))
+		elseif (is_string($countryfccn))
 		{
-			$query->where('a.country = ' . $db->quote($countryxdji));
+			$query->where('a.country = ' . $db->quote($countryfccn));
 		}
 		else
 		{
@@ -336,7 +336,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getNnfcompanies()
+	public function getJuzcompanies()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -379,15 +379,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 		$query->select($db->quoteName('i.user','serviceprovider_user'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.serviceprovider') . ' = ' . $db->quoteName('i.id') . ')');
 
-		// Filter by countrypapr global.
-		$countrypapr = $this->countrypapr;
-		if (is_numeric($countrypapr ))
+		// Filter by countryvjxo global.
+		$countryvjxo = $this->countryvjxo;
+		if (is_numeric($countryvjxo ))
 		{
-			$query->where('a.country = ' . (int) $countrypapr );
+			$query->where('a.country = ' . (int) $countryvjxo );
 		}
-		elseif (is_string($countrypapr))
+		elseif (is_string($countryvjxo))
 		{
-			$query->where('a.country = ' . $db->quote($countrypapr));
+			$query->where('a.country = ' . $db->quote($countryvjxo));
 		}
 		else
 		{
@@ -442,9 +442,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert department
-					$item->department = $this->selectionTranslationNnfcompanies($item->department, 'department');
+					$item->department = $this->selectionTranslationJuzcompanies($item->department, 'department');
 					// convert per
-					$item->per = $this->selectionTranslationNnfcompanies($item->per, 'per');
+					$item->per = $this->selectionTranslationJuzcompanies($item->per, 'per');
 				}
 			}
 
@@ -458,7 +458,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationNnfcompanies($value,$name)
+	public function selectionTranslationJuzcompanies($value,$name)
 	{
 		// Array of department language strings
 		if ($name == 'department')
diff --git a/admin/models/currencies.php b/admin/models/currencies.php
index 3165692c..b372db35 100644
--- a/admin/models/currencies.php
+++ b/admin/models/currencies.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currencies.php
diff --git a/admin/models/currency.php b/admin/models/currency.php
index 4177d7e6..527d09bd 100644
--- a/admin/models/currency.php
+++ b/admin/models/currency.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.php
diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php
index 8c181e69..3ef21a02 100644
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		articles.php
diff --git a/admin/models/fields/causesrisks.php b/admin/models/fields/causesrisks.php
index 2b1e1fe5..cec9bcf8 100644
--- a/admin/models/fields/causesrisks.php
+++ b/admin/models/fields/causesrisks.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causesrisks.php
diff --git a/admin/models/fields/causesriskscheck.php b/admin/models/fields/causesriskscheck.php
index f77085e4..58eafe3c 100644
--- a/admin/models/fields/causesriskscheck.php
+++ b/admin/models/fields/causesriskscheck.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causesriskscheck.php
diff --git a/admin/models/fields/company.php b/admin/models/fields/company.php
index 1f9829c5..32a514b1 100644
--- a/admin/models/fields/company.php
+++ b/admin/models/fields/company.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.php
diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php
index e1860d21..0c1a636b 100644
--- a/admin/models/fields/countries.php
+++ b/admin/models/fields/countries.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		countries.php
diff --git a/admin/models/fields/countryuser.php b/admin/models/fields/countryuser.php
index a691cc73..57550d8d 100644
--- a/admin/models/fields/countryuser.php
+++ b/admin/models/fields/countryuser.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		countryuser.php
diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php
index ae7cf3f5..3c9e6cac 100644
--- a/admin/models/fields/currency.php
+++ b/admin/models/fields/currency.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.php
diff --git a/admin/models/fields/datayear.php b/admin/models/fields/datayear.php
index c44e5bf6..cbbc34f8 100644
--- a/admin/models/fields/datayear.php
+++ b/admin/models/fields/datayear.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		datayear.php
diff --git a/admin/models/fields/interventions.php b/admin/models/fields/interventions.php
index 6bdb5ff3..fb6794a7 100644
--- a/admin/models/fields/interventions.php
+++ b/admin/models/fields/interventions.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions.php
diff --git a/admin/models/fields/memberuser.php b/admin/models/fields/memberuser.php
index 7f084fc1..7e5191e0 100644
--- a/admin/models/fields/memberuser.php
+++ b/admin/models/fields/memberuser.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		memberuser.php
diff --git a/admin/models/fields/serviceprovider.php b/admin/models/fields/serviceprovider.php
index 0121a9d2..088c4cbd 100644
--- a/admin/models/fields/serviceprovider.php
+++ b/admin/models/fields/serviceprovider.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		serviceprovider.php
diff --git a/admin/models/fields/serviceprovideruser.php b/admin/models/fields/serviceprovideruser.php
index 8771ae27..28e2cc57 100644
--- a/admin/models/fields/serviceprovideruser.php
+++ b/admin/models/fields/serviceprovideruser.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		serviceprovideruser.php
diff --git a/admin/models/forms/causerisk.js b/admin/models/forms/causerisk.js
index 2e5443f3..51f98eb6 100644
--- a/admin/models/forms/causerisk.js
+++ b/admin/models/forms/causerisk.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.js
diff --git a/admin/models/forms/company.js b/admin/models/forms/company.js
index e85e998a..1e16c839 100644
--- a/admin/models/forms/company.js
+++ b/admin/models/forms/company.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.js
@@ -17,178 +17,178 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_aoEEPbdXel_required = false;
-jform_aoEEPbdgEv_required = false;
-jform_aoEEPbdLdG_required = false;
-jform_aoEEPbdOpw_required = false;
-jform_aoEEPbdtyJ_required = false;
-jform_aoEEPbdtoS_required = false;
-jform_aoEEPbdnDg_required = false;
+jform_imCbNHFptl_required = false;
+jform_imCbNHFifp_required = false;
+jform_imCbNHFdFJ_required = false;
+jform_imCbNHFtBN_required = false;
+jform_imCbNHFXQG_required = false;
+jform_imCbNHFZvf_required = false;
+jform_imCbNHFMrX_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var department_aoEEPbd = jQuery("#jform_department input[type='radio']:checked").val();
-	aoEEPbd(department_aoEEPbd);
+	var department_imCbNHF = jQuery("#jform_department input[type='radio']:checked").val();
+	imCbNHF(department_imCbNHF);
 
-	var department_lHOlbmV = jQuery("#jform_department input[type='radio']:checked").val();
-	lHOlbmV(department_lHOlbmV);
+	var department_HpJMxqK = jQuery("#jform_department input[type='radio']:checked").val();
+	HpJMxqK(department_HpJMxqK);
 });
 
-// the aoEEPbd function
-function aoEEPbd(department_aoEEPbd)
+// the imCbNHF function
+function imCbNHF(department_imCbNHF)
 {
 	// set the function logic
-	if (department_aoEEPbd == 2)
+	if (department_imCbNHF == 2)
 	{
 		jQuery('#jform_causesrisks').closest('.control-group').show();
-		if (jform_aoEEPbdXel_required)
+		if (jform_imCbNHFptl_required)
 		{
 			updateFieldRequired('causesrisks',0);
 			jQuery('#jform_causesrisks').prop('required','required');
 			jQuery('#jform_causesrisks').attr('aria-required',true);
 			jQuery('#jform_causesrisks').addClass('required');
-			jform_aoEEPbdXel_required = false;
+			jform_imCbNHFptl_required = false;
 		}
 
 		jQuery('#jform_percentfemale').closest('.control-group').show();
 		jQuery('#jform_percentmale').closest('.control-group').show();
 		jQuery('#jform_productivity_losses').closest('.control-group').show();
-		if (jform_aoEEPbdgEv_required)
+		if (jform_imCbNHFifp_required)
 		{
 			updateFieldRequired('productivity_losses',0);
 			jQuery('#jform_productivity_losses').prop('required','required');
 			jQuery('#jform_productivity_losses').attr('aria-required',true);
 			jQuery('#jform_productivity_losses').addClass('required');
-			jform_aoEEPbdgEv_required = false;
+			jform_imCbNHFifp_required = false;
 		}
 
 		jQuery('#jform_medical_turnovers_females').closest('.control-group').show();
-		if (jform_aoEEPbdLdG_required)
+		if (jform_imCbNHFdFJ_required)
 		{
 			updateFieldRequired('medical_turnovers_females',0);
 			jQuery('#jform_medical_turnovers_females').prop('required','required');
 			jQuery('#jform_medical_turnovers_females').attr('aria-required',true);
 			jQuery('#jform_medical_turnovers_females').addClass('required');
-			jform_aoEEPbdLdG_required = false;
+			jform_imCbNHFdFJ_required = false;
 		}
 
 		jQuery('#jform_medical_turnovers_males').closest('.control-group').show();
-		if (jform_aoEEPbdOpw_required)
+		if (jform_imCbNHFtBN_required)
 		{
 			updateFieldRequired('medical_turnovers_males',0);
 			jQuery('#jform_medical_turnovers_males').prop('required','required');
 			jQuery('#jform_medical_turnovers_males').attr('aria-required',true);
 			jQuery('#jform_medical_turnovers_males').addClass('required');
-			jform_aoEEPbdOpw_required = false;
+			jform_imCbNHFtBN_required = false;
 		}
 
 		jQuery('#jform_sick_leave_females').closest('.control-group').show();
-		if (jform_aoEEPbdtyJ_required)
+		if (jform_imCbNHFXQG_required)
 		{
 			updateFieldRequired('sick_leave_females',0);
 			jQuery('#jform_sick_leave_females').prop('required','required');
 			jQuery('#jform_sick_leave_females').attr('aria-required',true);
 			jQuery('#jform_sick_leave_females').addClass('required');
-			jform_aoEEPbdtyJ_required = false;
+			jform_imCbNHFXQG_required = false;
 		}
 
 		jQuery('#jform_sick_leave_males').closest('.control-group').show();
-		if (jform_aoEEPbdtoS_required)
+		if (jform_imCbNHFZvf_required)
 		{
 			updateFieldRequired('sick_leave_males',0);
 			jQuery('#jform_sick_leave_males').prop('required','required');
 			jQuery('#jform_sick_leave_males').attr('aria-required',true);
 			jQuery('#jform_sick_leave_males').addClass('required');
-			jform_aoEEPbdtoS_required = false;
+			jform_imCbNHFZvf_required = false;
 		}
 
 		jQuery('#jform_total_healthcare').closest('.control-group').show();
-		if (jform_aoEEPbdnDg_required)
+		if (jform_imCbNHFMrX_required)
 		{
 			updateFieldRequired('total_healthcare',0);
 			jQuery('#jform_total_healthcare').prop('required','required');
 			jQuery('#jform_total_healthcare').attr('aria-required',true);
 			jQuery('#jform_total_healthcare').addClass('required');
-			jform_aoEEPbdnDg_required = false;
+			jform_imCbNHFMrX_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_causesrisks').closest('.control-group').hide();
-		if (!jform_aoEEPbdXel_required)
+		if (!jform_imCbNHFptl_required)
 		{
 			updateFieldRequired('causesrisks',1);
 			jQuery('#jform_causesrisks').removeAttr('required');
 			jQuery('#jform_causesrisks').removeAttr('aria-required');
 			jQuery('#jform_causesrisks').removeClass('required');
-			jform_aoEEPbdXel_required = true;
+			jform_imCbNHFptl_required = true;
 		}
 		jQuery('#jform_percentfemale').closest('.control-group').hide();
 		jQuery('#jform_percentmale').closest('.control-group').hide();
 		jQuery('#jform_productivity_losses').closest('.control-group').hide();
-		if (!jform_aoEEPbdgEv_required)
+		if (!jform_imCbNHFifp_required)
 		{
 			updateFieldRequired('productivity_losses',1);
 			jQuery('#jform_productivity_losses').removeAttr('required');
 			jQuery('#jform_productivity_losses').removeAttr('aria-required');
 			jQuery('#jform_productivity_losses').removeClass('required');
-			jform_aoEEPbdgEv_required = true;
+			jform_imCbNHFifp_required = true;
 		}
 		jQuery('#jform_medical_turnovers_females').closest('.control-group').hide();
-		if (!jform_aoEEPbdLdG_required)
+		if (!jform_imCbNHFdFJ_required)
 		{
 			updateFieldRequired('medical_turnovers_females',1);
 			jQuery('#jform_medical_turnovers_females').removeAttr('required');
 			jQuery('#jform_medical_turnovers_females').removeAttr('aria-required');
 			jQuery('#jform_medical_turnovers_females').removeClass('required');
-			jform_aoEEPbdLdG_required = true;
+			jform_imCbNHFdFJ_required = true;
 		}
 		jQuery('#jform_medical_turnovers_males').closest('.control-group').hide();
-		if (!jform_aoEEPbdOpw_required)
+		if (!jform_imCbNHFtBN_required)
 		{
 			updateFieldRequired('medical_turnovers_males',1);
 			jQuery('#jform_medical_turnovers_males').removeAttr('required');
 			jQuery('#jform_medical_turnovers_males').removeAttr('aria-required');
 			jQuery('#jform_medical_turnovers_males').removeClass('required');
-			jform_aoEEPbdOpw_required = true;
+			jform_imCbNHFtBN_required = true;
 		}
 		jQuery('#jform_sick_leave_females').closest('.control-group').hide();
-		if (!jform_aoEEPbdtyJ_required)
+		if (!jform_imCbNHFXQG_required)
 		{
 			updateFieldRequired('sick_leave_females',1);
 			jQuery('#jform_sick_leave_females').removeAttr('required');
 			jQuery('#jform_sick_leave_females').removeAttr('aria-required');
 			jQuery('#jform_sick_leave_females').removeClass('required');
-			jform_aoEEPbdtyJ_required = true;
+			jform_imCbNHFXQG_required = true;
 		}
 		jQuery('#jform_sick_leave_males').closest('.control-group').hide();
-		if (!jform_aoEEPbdtoS_required)
+		if (!jform_imCbNHFZvf_required)
 		{
 			updateFieldRequired('sick_leave_males',1);
 			jQuery('#jform_sick_leave_males').removeAttr('required');
 			jQuery('#jform_sick_leave_males').removeAttr('aria-required');
 			jQuery('#jform_sick_leave_males').removeClass('required');
-			jform_aoEEPbdtoS_required = true;
+			jform_imCbNHFZvf_required = true;
 		}
 		jQuery('#jform_total_healthcare').closest('.control-group').hide();
-		if (!jform_aoEEPbdnDg_required)
+		if (!jform_imCbNHFMrX_required)
 		{
 			updateFieldRequired('total_healthcare',1);
 			jQuery('#jform_total_healthcare').removeAttr('required');
 			jQuery('#jform_total_healthcare').removeAttr('aria-required');
 			jQuery('#jform_total_healthcare').removeClass('required');
-			jform_aoEEPbdnDg_required = true;
+			jform_imCbNHFMrX_required = true;
 		}
 	}
 }
 
-// the lHOlbmV function
-function lHOlbmV(department_lHOlbmV)
+// the HpJMxqK function
+function HpJMxqK(department_HpJMxqK)
 {
 	// set the function logic
-	if (department_lHOlbmV == 1)
+	if (department_HpJMxqK == 1)
 	{
 		jQuery('.age_groups_note').closest('.control-group').show();
 		jQuery('.cause_risk_selection_note').closest('.control-group').show();
diff --git a/admin/models/forms/country.js b/admin/models/forms/country.js
index 977001bf..a3a35700 100644
--- a/admin/models/forms/country.js
+++ b/admin/models/forms/country.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		country.js
diff --git a/admin/models/forms/country.xml b/admin/models/forms/country.xml
index 7efb1a80..8ce3b479 100644
--- a/admin/models/forms/country.xml
+++ b/admin/models/forms/country.xml
@@ -517,7 +517,7 @@
 			maxlength="150"
 			description="COM_COSTBENEFITPROJECTION_COUNTRY_PUBLICNUMBER_DESCRIPTION"
 			class="text_area"
-			filter="tel"
+			filter="STRING"
 			validated="tel"
 			message="Error! Please add public phone number here."
 			hint="COM_COSTBENEFITPROJECTION_COUNTRY_PUBLICNUMBER_HINT"
diff --git a/admin/models/forms/currency.js b/admin/models/forms/currency.js
index 8c664d65..e1130ed8 100644
--- a/admin/models/forms/currency.js
+++ b/admin/models/forms/currency.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.js
diff --git a/admin/models/forms/health_data.js b/admin/models/forms/health_data.js
index 8c77b59a..5fa098eb 100644
--- a/admin/models/forms/health_data.js
+++ b/admin/models/forms/health_data.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data.js
diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js
index 92266b5a..0840be72 100644
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_document.js
@@ -17,38 +17,38 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_UJteXUtgky_required = false;
-jform_QEIUlDzBxE_required = false;
-jform_TReWnxQEpN_required = false;
-jform_LjCaoATFEe_required = false;
+jform_nBdbRfDClv_required = false;
+jform_typoIBttBg_required = false;
+jform_escOQgLoFt_required = false;
+jform_ENSCNMHstX_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_wbXluyd = jQuery("#jform_location input[type='radio']:checked").val();
-	wbXluyd(location_wbXluyd);
+	var location_HSNKYXL = jQuery("#jform_location input[type='radio']:checked").val();
+	HSNKYXL(location_HSNKYXL);
 
-	var location_uuUtMWc = jQuery("#jform_location input[type='radio']:checked").val();
-	uuUtMWc(location_uuUtMWc);
+	var location_qeWtANs = jQuery("#jform_location input[type='radio']:checked").val();
+	qeWtANs(location_qeWtANs);
 
-	var type_UJteXUt = jQuery("#jform_type").val();
-	UJteXUt(type_UJteXUt);
+	var type_nBdbRfD = jQuery("#jform_type").val();
+	nBdbRfD(type_nBdbRfD);
 
-	var type_QEIUlDz = jQuery("#jform_type").val();
-	QEIUlDz(type_QEIUlDz);
+	var type_typoIBt = jQuery("#jform_type").val();
+	typoIBt(type_typoIBt);
 
-	var type_TReWnxQ = jQuery("#jform_type").val();
-	TReWnxQ(type_TReWnxQ);
+	var type_escOQgL = jQuery("#jform_type").val();
+	escOQgL(type_escOQgL);
 
-	var target_LjCaoAT = jQuery("#jform_target input[type='radio']:checked").val();
-	LjCaoAT(target_LjCaoAT);
+	var target_ENSCNMH = jQuery("#jform_target input[type='radio']:checked").val();
+	ENSCNMH(target_ENSCNMH);
 });
 
-// the wbXluyd function
-function wbXluyd(location_wbXluyd)
+// the HSNKYXL function
+function HSNKYXL(location_HSNKYXL)
 {
 	// set the function logic
-	if (location_wbXluyd == 1)
+	if (location_HSNKYXL == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
 	}
@@ -58,11 +58,11 @@ function wbXluyd(location_wbXluyd)
 	}
 }
 
-// the uuUtMWc function
-function uuUtMWc(location_uuUtMWc)
+// the qeWtANs function
+function qeWtANs(location_qeWtANs)
 {
 	// set the function logic
-	if (location_uuUtMWc == 2)
+	if (location_qeWtANs == 2)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
 	}
@@ -72,198 +72,198 @@ function uuUtMWc(location_uuUtMWc)
 	}
 }
 
-// the UJteXUt function
-function UJteXUt(type_UJteXUt)
+// the nBdbRfD function
+function nBdbRfD(type_nBdbRfD)
 {
-	if (isSet(type_UJteXUt) && type_UJteXUt.constructor !== Array)
+	if (isSet(type_nBdbRfD) && type_nBdbRfD.constructor !== Array)
 	{
-		var temp_UJteXUt = type_UJteXUt;
-		var type_UJteXUt = [];
-		type_UJteXUt.push(temp_UJteXUt);
+		var temp_nBdbRfD = type_nBdbRfD;
+		var type_nBdbRfD = [];
+		type_nBdbRfD.push(temp_nBdbRfD);
 	}
-	else if (!isSet(type_UJteXUt))
+	else if (!isSet(type_nBdbRfD))
 	{
-		var type_UJteXUt = [];
+		var type_nBdbRfD = [];
 	}
-	var type = type_UJteXUt.some(type_UJteXUt_SomeFunc);
+	var type = type_nBdbRfD.some(type_nBdbRfD_SomeFunc);
 
 
 	// set this function logic
 	if (type)
 	{
 		jQuery('#jform_url').closest('.control-group').show();
-		if (jform_UJteXUtgky_required)
+		if (jform_nBdbRfDClv_required)
 		{
 			updateFieldRequired('url',0);
 			jQuery('#jform_url').prop('required','required');
 			jQuery('#jform_url').attr('aria-required',true);
 			jQuery('#jform_url').addClass('required');
-			jform_UJteXUtgky_required = false;
+			jform_nBdbRfDClv_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_url').closest('.control-group').hide();
-		if (!jform_UJteXUtgky_required)
+		if (!jform_nBdbRfDClv_required)
 		{
 			updateFieldRequired('url',1);
 			jQuery('#jform_url').removeAttr('required');
 			jQuery('#jform_url').removeAttr('aria-required');
 			jQuery('#jform_url').removeClass('required');
-			jform_UJteXUtgky_required = true;
+			jform_nBdbRfDClv_required = true;
 		}
 	}
 }
 
-// the UJteXUt Some function
-function type_UJteXUt_SomeFunc(type_UJteXUt)
+// the nBdbRfD Some function
+function type_nBdbRfD_SomeFunc(type_nBdbRfD)
 {
 	// set the function logic
-	if (type_UJteXUt == 3)
+	if (type_nBdbRfD == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the QEIUlDz function
-function QEIUlDz(type_QEIUlDz)
+// the typoIBt function
+function typoIBt(type_typoIBt)
 {
-	if (isSet(type_QEIUlDz) && type_QEIUlDz.constructor !== Array)
+	if (isSet(type_typoIBt) && type_typoIBt.constructor !== Array)
 	{
-		var temp_QEIUlDz = type_QEIUlDz;
-		var type_QEIUlDz = [];
-		type_QEIUlDz.push(temp_QEIUlDz);
+		var temp_typoIBt = type_typoIBt;
+		var type_typoIBt = [];
+		type_typoIBt.push(temp_typoIBt);
 	}
-	else if (!isSet(type_QEIUlDz))
+	else if (!isSet(type_typoIBt))
 	{
-		var type_QEIUlDz = [];
+		var type_typoIBt = [];
 	}
-	var type = type_QEIUlDz.some(type_QEIUlDz_SomeFunc);
+	var type = type_typoIBt.some(type_typoIBt_SomeFunc);
 
 
 	// set this function logic
 	if (type)
 	{
 		jQuery('#jform_article').closest('.control-group').show();
-		if (jform_QEIUlDzBxE_required)
+		if (jform_typoIBttBg_required)
 		{
 			updateFieldRequired('article',0);
 			jQuery('#jform_article').prop('required','required');
 			jQuery('#jform_article').attr('aria-required',true);
 			jQuery('#jform_article').addClass('required');
-			jform_QEIUlDzBxE_required = false;
+			jform_typoIBttBg_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_article').closest('.control-group').hide();
-		if (!jform_QEIUlDzBxE_required)
+		if (!jform_typoIBttBg_required)
 		{
 			updateFieldRequired('article',1);
 			jQuery('#jform_article').removeAttr('required');
 			jQuery('#jform_article').removeAttr('aria-required');
 			jQuery('#jform_article').removeClass('required');
-			jform_QEIUlDzBxE_required = true;
+			jform_typoIBttBg_required = true;
 		}
 	}
 }
 
-// the QEIUlDz Some function
-function type_QEIUlDz_SomeFunc(type_QEIUlDz)
+// the typoIBt Some function
+function type_typoIBt_SomeFunc(type_typoIBt)
 {
 	// set the function logic
-	if (type_QEIUlDz == 1)
+	if (type_typoIBt == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the TReWnxQ function
-function TReWnxQ(type_TReWnxQ)
+// the escOQgL function
+function escOQgL(type_escOQgL)
 {
-	if (isSet(type_TReWnxQ) && type_TReWnxQ.constructor !== Array)
+	if (isSet(type_escOQgL) && type_escOQgL.constructor !== Array)
 	{
-		var temp_TReWnxQ = type_TReWnxQ;
-		var type_TReWnxQ = [];
-		type_TReWnxQ.push(temp_TReWnxQ);
+		var temp_escOQgL = type_escOQgL;
+		var type_escOQgL = [];
+		type_escOQgL.push(temp_escOQgL);
 	}
-	else if (!isSet(type_TReWnxQ))
+	else if (!isSet(type_escOQgL))
 	{
-		var type_TReWnxQ = [];
+		var type_escOQgL = [];
 	}
-	var type = type_TReWnxQ.some(type_TReWnxQ_SomeFunc);
+	var type = type_escOQgL.some(type_escOQgL_SomeFunc);
 
 
 	// set this function logic
 	if (type)
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').show();
-		if (jform_TReWnxQEpN_required)
+		if (jform_escOQgLoFt_required)
 		{
 			updateFieldRequired('content',0);
 			jQuery('#jform_content').prop('required','required');
 			jQuery('#jform_content').attr('aria-required',true);
 			jQuery('#jform_content').addClass('required');
-			jform_TReWnxQEpN_required = false;
+			jform_escOQgLoFt_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').hide();
-		if (!jform_TReWnxQEpN_required)
+		if (!jform_escOQgLoFt_required)
 		{
 			updateFieldRequired('content',1);
 			jQuery('#jform_content').removeAttr('required');
 			jQuery('#jform_content').removeAttr('aria-required');
 			jQuery('#jform_content').removeClass('required');
-			jform_TReWnxQEpN_required = true;
+			jform_escOQgLoFt_required = true;
 		}
 	}
 }
 
-// the TReWnxQ Some function
-function type_TReWnxQ_SomeFunc(type_TReWnxQ)
+// the escOQgL Some function
+function type_escOQgL_SomeFunc(type_escOQgL)
 {
 	// set the function logic
-	if (type_TReWnxQ == 2)
+	if (type_escOQgL == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the LjCaoAT function
-function LjCaoAT(target_LjCaoAT)
+// the ENSCNMH function
+function ENSCNMH(target_ENSCNMH)
 {
 	// set the function logic
-	if (target_LjCaoAT == 1)
+	if (target_ENSCNMH == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
-		if (jform_LjCaoATFEe_required)
+		if (jform_ENSCNMHstX_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_LjCaoATFEe_required = false;
+			jform_ENSCNMHstX_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
-		if (!jform_LjCaoATFEe_required)
+		if (!jform_ENSCNMHstX_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_LjCaoATFEe_required = true;
+			jform_ENSCNMHstX_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/intervention.js b/admin/models/forms/intervention.js
index e02714d8..616946a0 100644
--- a/admin/models/forms/intervention.js
+++ b/admin/models/forms/intervention.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.js
@@ -17,58 +17,58 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_mHPeTPUmdM_required = false;
-jform_imgMwkfMOF_required = false;
+jform_hjWzglcxQU_required = false;
+jform_QhXOtTUjpY_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var type_mHPeTPU = jQuery("#jform_type input[type='radio']:checked").val();
-	mHPeTPU(type_mHPeTPU);
+	var type_hjWzglc = jQuery("#jform_type input[type='radio']:checked").val();
+	hjWzglc(type_hjWzglc);
 
-	var type_iOljoGp = jQuery("#jform_type input[type='radio']:checked").val();
-	iOljoGp(type_iOljoGp);
+	var type_KIPRxZv = jQuery("#jform_type input[type='radio']:checked").val();
+	KIPRxZv(type_KIPRxZv);
 
-	var company_imgMwkf = jQuery("#jform_company").val();
-	imgMwkf(company_imgMwkf);
+	var company_QhXOtTU = jQuery("#jform_company").val();
+	QhXOtTU(company_QhXOtTU);
 });
 
-// the mHPeTPU function
-function mHPeTPU(type_mHPeTPU)
+// the hjWzglc function
+function hjWzglc(type_hjWzglc)
 {
 	// set the function logic
-	if (type_mHPeTPU == 2)
+	if (type_hjWzglc == 2)
 	{
 		jQuery('#jform_interventions').closest('.control-group').show();
-		if (jform_mHPeTPUmdM_required)
+		if (jform_hjWzglcxQU_required)
 		{
 			updateFieldRequired('interventions',0);
 			jQuery('#jform_interventions').prop('required','required');
 			jQuery('#jform_interventions').attr('aria-required',true);
 			jQuery('#jform_interventions').addClass('required');
-			jform_mHPeTPUmdM_required = false;
+			jform_hjWzglcxQU_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_interventions').closest('.control-group').hide();
-		if (!jform_mHPeTPUmdM_required)
+		if (!jform_hjWzglcxQU_required)
 		{
 			updateFieldRequired('interventions',1);
 			jQuery('#jform_interventions').removeAttr('required');
 			jQuery('#jform_interventions').removeAttr('aria-required');
 			jQuery('#jform_interventions').removeClass('required');
-			jform_mHPeTPUmdM_required = true;
+			jform_hjWzglcxQU_required = true;
 		}
 	}
 }
 
-// the iOljoGp function
-function iOljoGp(type_iOljoGp)
+// the KIPRxZv function
+function KIPRxZv(type_KIPRxZv)
 {
 	// set the function logic
-	if (type_iOljoGp == 1)
+	if (type_KIPRxZv == 1)
 	{
 		jQuery('#jform_intervention').closest('.control-group').show();
 	}
@@ -78,55 +78,55 @@ function iOljoGp(type_iOljoGp)
 	}
 }
 
-// the imgMwkf function
-function imgMwkf(company_imgMwkf)
+// the QhXOtTU function
+function QhXOtTU(company_QhXOtTU)
 {
-	if (isSet(company_imgMwkf) && company_imgMwkf.constructor !== Array)
+	if (isSet(company_QhXOtTU) && company_QhXOtTU.constructor !== Array)
 	{
-		var temp_imgMwkf = company_imgMwkf;
-		var company_imgMwkf = [];
-		company_imgMwkf.push(temp_imgMwkf);
+		var temp_QhXOtTU = company_QhXOtTU;
+		var company_QhXOtTU = [];
+		company_QhXOtTU.push(temp_QhXOtTU);
 	}
-	else if (!isSet(company_imgMwkf))
+	else if (!isSet(company_QhXOtTU))
 	{
-		var company_imgMwkf = [];
+		var company_QhXOtTU = [];
 	}
-	var company = company_imgMwkf.some(company_imgMwkf_SomeFunc);
+	var company = company_QhXOtTU.some(company_QhXOtTU_SomeFunc);
 
 
 	// set this function logic
 	if (company)
 	{
 		jQuery('#jform_country').closest('.control-group').show();
-		if (jform_imgMwkfMOF_required)
+		if (jform_QhXOtTUjpY_required)
 		{
 			updateFieldRequired('country',0);
 			jQuery('#jform_country').prop('required','required');
 			jQuery('#jform_country').attr('aria-required',true);
 			jQuery('#jform_country').addClass('required');
-			jform_imgMwkfMOF_required = false;
+			jform_QhXOtTUjpY_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_country').closest('.control-group').hide();
-		if (!jform_imgMwkfMOF_required)
+		if (!jform_QhXOtTUjpY_required)
 		{
 			updateFieldRequired('country',1);
 			jQuery('#jform_country').removeAttr('required');
 			jQuery('#jform_country').removeAttr('aria-required');
 			jQuery('#jform_country').removeClass('required');
-			jform_imgMwkfMOF_required = true;
+			jform_QhXOtTUjpY_required = true;
 		}
 	}
 }
 
-// the imgMwkf Some function
-function company_imgMwkf_SomeFunc(company_imgMwkf)
+// the QhXOtTU Some function
+function company_QhXOtTU_SomeFunc(company_QhXOtTU)
 {
 	// set the function logic
-	if (company_imgMwkf == 0)
+	if (company_QhXOtTU == 0)
 	{
 		return true;
 	}
diff --git a/admin/models/forms/scaling_factor.js b/admin/models/forms/scaling_factor.js
index b595ff3f..6d9ee789 100644
--- a/admin/models/forms/scaling_factor.js
+++ b/admin/models/forms/scaling_factor.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.js
@@ -17,64 +17,64 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_cfzxGECrmV_required = false;
+jform_gXgQwdAHQh_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var company_cfzxGEC = jQuery("#jform_company").val();
-	cfzxGEC(company_cfzxGEC);
+	var company_gXgQwdA = jQuery("#jform_company").val();
+	gXgQwdA(company_gXgQwdA);
 });
 
-// the cfzxGEC function
-function cfzxGEC(company_cfzxGEC)
+// the gXgQwdA function
+function gXgQwdA(company_gXgQwdA)
 {
-	if (isSet(company_cfzxGEC) && company_cfzxGEC.constructor !== Array)
+	if (isSet(company_gXgQwdA) && company_gXgQwdA.constructor !== Array)
 	{
-		var temp_cfzxGEC = company_cfzxGEC;
-		var company_cfzxGEC = [];
-		company_cfzxGEC.push(temp_cfzxGEC);
+		var temp_gXgQwdA = company_gXgQwdA;
+		var company_gXgQwdA = [];
+		company_gXgQwdA.push(temp_gXgQwdA);
 	}
-	else if (!isSet(company_cfzxGEC))
+	else if (!isSet(company_gXgQwdA))
 	{
-		var company_cfzxGEC = [];
+		var company_gXgQwdA = [];
 	}
-	var company = company_cfzxGEC.some(company_cfzxGEC_SomeFunc);
+	var company = company_gXgQwdA.some(company_gXgQwdA_SomeFunc);
 
 
 	// set this function logic
 	if (company)
 	{
 		jQuery('#jform_country').closest('.control-group').show();
-		if (jform_cfzxGECrmV_required)
+		if (jform_gXgQwdAHQh_required)
 		{
 			updateFieldRequired('country',0);
 			jQuery('#jform_country').prop('required','required');
 			jQuery('#jform_country').attr('aria-required',true);
 			jQuery('#jform_country').addClass('required');
-			jform_cfzxGECrmV_required = false;
+			jform_gXgQwdAHQh_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_country').closest('.control-group').hide();
-		if (!jform_cfzxGECrmV_required)
+		if (!jform_gXgQwdAHQh_required)
 		{
 			updateFieldRequired('country',1);
 			jQuery('#jform_country').removeAttr('required');
 			jQuery('#jform_country').removeAttr('aria-required');
 			jQuery('#jform_country').removeClass('required');
-			jform_cfzxGECrmV_required = true;
+			jform_gXgQwdAHQh_required = true;
 		}
 	}
 }
 
-// the cfzxGEC Some function
-function company_cfzxGEC_SomeFunc(company_cfzxGEC)
+// the gXgQwdA Some function
+function company_gXgQwdA_SomeFunc(company_gXgQwdA)
 {
 	// set the function logic
-	if (company_cfzxGEC == 0)
+	if (company_gXgQwdA == 0)
 	{
 		return true;
 	}
diff --git a/admin/models/forms/service_provider.js b/admin/models/forms/service_provider.js
index 0982f868..90405d22 100644
--- a/admin/models/forms/service_provider.js
+++ b/admin/models/forms/service_provider.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_provider.js
diff --git a/admin/models/forms/service_provider.xml b/admin/models/forms/service_provider.xml
index 076a48f9..59aefbce 100644
--- a/admin/models/forms/service_provider.xml
+++ b/admin/models/forms/service_provider.xml
@@ -133,7 +133,7 @@
 			maxlength="150"
 			description="COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_PUBLICNUMBER_DESCRIPTION"
 			class="text_area"
-			filter="tel"
+			filter="STRING"
 			validated="tel"
 			message="Error! Please add public phone number here."
 			hint="COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_PUBLICNUMBER_HINT"
diff --git a/admin/models/health_data.php b/admin/models/health_data.php
index 5472720f..9a30379f 100644
--- a/admin/models/health_data.php
+++ b/admin/models/health_data.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data.php
diff --git a/admin/models/health_data_sets.php b/admin/models/health_data_sets.php
index abf272bc..5cf78f66 100644
--- a/admin/models/health_data_sets.php
+++ b/admin/models/health_data_sets.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_sets.php
diff --git a/admin/models/help_document.php b/admin/models/help_document.php
index 47d5b63b..a01f8d17 100644
--- a/admin/models/help_document.php
+++ b/admin/models/help_document.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_document.php
diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php
index d9f74a1a..49aa5325 100644
--- a/admin/models/help_documents.php
+++ b/admin/models/help_documents.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_documents.php
diff --git a/admin/models/import.php b/admin/models/import.php
index b22a2ff4..abb3deb2 100644
--- a/admin/models/import.php
+++ b/admin/models/import.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		import.php
diff --git a/admin/models/intervention.php b/admin/models/intervention.php
index 38f55f8a..66cb0a23 100644
--- a/admin/models/intervention.php
+++ b/admin/models/intervention.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.php
diff --git a/admin/models/interventions.php b/admin/models/interventions.php
index 4e8f554e..eacbc575 100644
--- a/admin/models/interventions.php
+++ b/admin/models/interventions.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions.php
diff --git a/admin/models/scaling_factor.php b/admin/models/scaling_factor.php
index d5533f70..3a738545 100644
--- a/admin/models/scaling_factor.php
+++ b/admin/models/scaling_factor.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.php
diff --git a/admin/models/scaling_factors.php b/admin/models/scaling_factors.php
index 6c107c06..d7540ba7 100644
--- a/admin/models/scaling_factors.php
+++ b/admin/models/scaling_factors.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors.php
diff --git a/admin/models/service_provider.php b/admin/models/service_provider.php
index 5568ba25..7f54909c 100644
--- a/admin/models/service_provider.php
+++ b/admin/models/service_provider.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_provider.php
@@ -95,7 +95,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_costbenefitprojection.service_provider');
 			}
 		}
-		$this->serviceprovidervwpu = $item->id;
+		$this->serviceprovidereiwh = $item->id;
 
 		return $item;
 	}
@@ -105,7 +105,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getRtncompanies()
+	public function getSrvcompanies()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -148,15 +148,15 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 		$query->select($db->quoteName('i.user','serviceprovider_user'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.serviceprovider') . ' = ' . $db->quoteName('i.id') . ')');
 
-		// Filter by serviceprovidervwpu global.
-		$serviceprovidervwpu = $this->serviceprovidervwpu;
-		if (is_numeric($serviceprovidervwpu ))
+		// Filter by serviceprovidereiwh global.
+		$serviceprovidereiwh = $this->serviceprovidereiwh;
+		if (is_numeric($serviceprovidereiwh ))
 		{
-			$query->where('a.serviceprovider = ' . (int) $serviceprovidervwpu );
+			$query->where('a.serviceprovider = ' . (int) $serviceprovidereiwh );
 		}
-		elseif (is_string($serviceprovidervwpu))
+		elseif (is_string($serviceprovidereiwh))
 		{
-			$query->where('a.serviceprovider = ' . $db->quote($serviceprovidervwpu));
+			$query->where('a.serviceprovider = ' . $db->quote($serviceprovidereiwh));
 		}
 		else
 		{
@@ -211,9 +211,9 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert department
-					$item->department = $this->selectionTranslationRtncompanies($item->department, 'department');
+					$item->department = $this->selectionTranslationSrvcompanies($item->department, 'department');
 					// convert per
-					$item->per = $this->selectionTranslationRtncompanies($item->per, 'per');
+					$item->per = $this->selectionTranslationSrvcompanies($item->per, 'per');
 				}
 			}
 
@@ -227,7 +227,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationRtncompanies($value,$name)
+	public function selectionTranslationSrvcompanies($value,$name)
 	{
 		// Array of department language strings
 		if ($name == 'department')
diff --git a/admin/models/service_providers.php b/admin/models/service_providers.php
index fd6d543e..d6742fe3 100644
--- a/admin/models/service_providers.php
+++ b/admin/models/service_providers.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_providers.php
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index fd0cccae..a2c8e2f6 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -482,7 +482,7 @@ INSERT INTO `#__costbenefitprojection_country` (`id`, `alias`, `causesrisks`, `c
 (115, '', '', 'LAO', 'LA', 'LAK', '', '', '', '', '', '', '', 'Lao People\'s Democratic Republic', '', '', '', '', '', '', '', '', '', '', '', '', 2, '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 1, '', '', ''),
 (116, '', '', 'LVA', 'LV', 'LVL', '', '', '', '', '', '', '', 'Latvia', '', '', '', '', '', '', '', '', '', '', '', '', 2, '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 1, '', '', ''),
 (117, '', '', 'LBN', 'LB', 'LBP', '', '', '', '', '', '', '', 'Lebanon', '', '', '', '', '', '', '', '', '', '', '', '', 2, '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 1, '', '', ''),
-(118, 'lesotho', '[\"2\",\"3\",\"69\",\"145\",\"198\",\"265\",\"266\",\"267\",\"268\",\"271\",\"274\"]', 'LSO', 'LS', 'ZAR', 2010, '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[368.569,1186.58,1943.39,2169.07,1915.73,1682.56,1634.35,1080.38,1644.78,2060.06],\"year\":[\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\"]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[10168.8,12190,15393.5,18885.3,21683.2,21146.3,20469.5,19992.1,20473.8,21606.3],\"year\":[\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\"]}', 0.25, '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[426.617,938.891,1708.1,2290.08,2608.17,2608.38,2903.13,3246.22,3621.02,4575.96],\"year\":[\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\"]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[9316.97,10273.7,12699.9,15360.2,19357.5,21904.1,23063.8,21621.5,22626.7,23147.7],\"year\":[\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\"]}', 10, 'Lesotho', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"percent\":[10,10,10,10,10,10,10,10,10,10]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"percent\":[10,10,10,10,10,10,10,10,10,10]}', 0.25, 0.3, '', '', '', '', 10, 231, '', '', 1, 98, '', '2014-09-16 14:16:50', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 1, '', 1, 206),
+(118, 'lesotho', '[\"2\",\"3\",\"69\",\"145\",\"198\",\"265\",\"266\",\"267\",\"268\",\"271\",\"274\"]', 'LSO', 'LS', 'ZAR', 2010, '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[368.569,1186.58,1943.39,2169.07,1915.73,1682.56,1634.35,1080.38,1644.78,2060.06],\"year\":[\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\"]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[10168.8,12190,15393.5,18885.3,21683.2,21146.3,20469.5,19992.1,20473.8,21606.3],\"year\":[\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\"]}', 0.25, '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[426.617,938.891,1708.1,2290.08,2608.17,2608.38,2903.13,3246.22,3621.02,4575.96],\"year\":[\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\"]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[9316.97,10273.7,12699.9,15360.2,19357.5,21904.1,23063.8,21621.5,22626.7,23147.7],\"year\":[\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\",\"2010\"]}', 10, 'Lesotho', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"percent\":[10,10,10,10,10,10,10,10,10,10]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"percent\":[10,10,10,10,10,10,10,10,10,10]}', 0.25, 0.3, '', '', '', 061300754, 10, 231, '', '', 1, 98, 450, '2014-09-16 14:16:50', '2016-02-15 09:34:43', '', '0000-00-00 00:00:00', 2, '', 1, 206),
 (119, '', '', 'LBR', 'LR', 'LRD', '', '', '', '', '', '', '', 'Liberia', '', '', '', '', '', '', '', '', '', '', '', '', 2, '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 1, '', '', ''),
 (120, '', '', 'LBY', 'LY', 'LYD', '', '', '', '', '', '', '', 'Libya', '', '', '', '', '', '', '', '', '', '', '', '', 2, '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 1, '', '', ''),
 (121, '', '', 'LIE', 'LI', 'CHF', '', '', '', '', '', '', '', 'Liechtenstein', '', '', '', '', '', '', '', '', '', '', '', '', 2, '', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00', 1, '', '', ''),
diff --git a/admin/sql/updates/mysql/3.3.0.sql b/admin/sql/updates/mysql/3.3.0.sql
new file mode 100644
index 00000000..d3f5a12f
--- /dev/null
+++ b/admin/sql/updates/mysql/3.3.0.sql
@@ -0,0 +1 @@
+
diff --git a/admin/tables/causerisk.php b/admin/tables/causerisk.php
index 6bd118a3..1f93018e 100644
--- a/admin/tables/causerisk.php
+++ b/admin/tables/causerisk.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.php
diff --git a/admin/tables/company.php b/admin/tables/company.php
index fce52d41..6337101b 100644
--- a/admin/tables/company.php
+++ b/admin/tables/company.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.php
diff --git a/admin/tables/country.php b/admin/tables/country.php
index b7048095..cc46689a 100644
--- a/admin/tables/country.php
+++ b/admin/tables/country.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		country.php
diff --git a/admin/tables/currency.php b/admin/tables/currency.php
index 8095e5cd..16dd5cb2 100644
--- a/admin/tables/currency.php
+++ b/admin/tables/currency.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.php
diff --git a/admin/tables/health_data.php b/admin/tables/health_data.php
index 28e6aaba..89e8246d 100644
--- a/admin/tables/health_data.php
+++ b/admin/tables/health_data.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data.php
diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php
index 7e87596a..4bccafd9 100644
--- a/admin/tables/help_document.php
+++ b/admin/tables/help_document.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_document.php
diff --git a/admin/tables/intervention.php b/admin/tables/intervention.php
index 259e6c9d..bf820c85 100644
--- a/admin/tables/intervention.php
+++ b/admin/tables/intervention.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.php
diff --git a/admin/tables/scaling_factor.php b/admin/tables/scaling_factor.php
index c4253864..83aabdfa 100644
--- a/admin/tables/scaling_factor.php
+++ b/admin/tables/scaling_factor.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.php
diff --git a/admin/tables/service_provider.php b/admin/tables/service_provider.php
index 67aa8135..9699f29f 100644
--- a/admin/tables/service_provider.php
+++ b/admin/tables/service_provider.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_provider.php
diff --git a/admin/vdm.php b/admin/vdm.php
index 385fdc7a..1599e734 100644
--- a/admin/vdm.php
+++ b/admin/vdm.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		vdm.php
diff --git a/admin/views/causerisk/submitbutton.js b/admin/views/causerisk/submitbutton.js
index 93492bd6..dc9e8748 100644
--- a/admin/views/causerisk/submitbutton.js
+++ b/admin/views/causerisk/submitbutton.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/causerisk/tmpl/edit.php b/admin/views/causerisk/tmpl/edit.php
index cc9ded4a..5d69636a 100644
--- a/admin/views/causerisk/tmpl/edit.php
+++ b/admin/views/causerisk/tmpl/edit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
diff --git a/admin/views/causerisk/view.html.php b/admin/views/causerisk/view.html.php
index d10ba90f..e1b56ee1 100644
--- a/admin/views/causerisk/view.html.php
+++ b/admin/views/causerisk/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/causesrisks/tmpl/default.php b/admin/views/causesrisks/tmpl/default.php
index 34f3e5d7..d89b9b06 100644
--- a/admin/views/causesrisks/tmpl/default.php
+++ b/admin/views/causesrisks/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/causesrisks/tmpl/default_batch_body.php b/admin/views/causesrisks/tmpl/default_batch_body.php
index b3d3d044..422ca659 100644
--- a/admin/views/causesrisks/tmpl/default_batch_body.php
+++ b/admin/views/causesrisks/tmpl/default_batch_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/causesrisks/tmpl/default_batch_footer.php b/admin/views/causesrisks/tmpl/default_batch_footer.php
index 90ade1ca..218309ba 100644
--- a/admin/views/causesrisks/tmpl/default_batch_footer.php
+++ b/admin/views/causesrisks/tmpl/default_batch_footer.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/causesrisks/tmpl/default_body.php b/admin/views/causesrisks/tmpl/default_body.php
index 923ec2f1..8c55dcf6 100644
--- a/admin/views/causesrisks/tmpl/default_body.php
+++ b/admin/views/causesrisks/tmpl/default_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/causesrisks/tmpl/default_foot.php b/admin/views/causesrisks/tmpl/default_foot.php
index bfcf50db..73bf9366 100644
--- a/admin/views/causesrisks/tmpl/default_foot.php
+++ b/admin/views/causesrisks/tmpl/default_foot.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/causesrisks/tmpl/default_head.php b/admin/views/causesrisks/tmpl/default_head.php
index 8040f5f5..a90fd326 100644
--- a/admin/views/causesrisks/tmpl/default_head.php
+++ b/admin/views/causesrisks/tmpl/default_head.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/causesrisks/tmpl/default_toolbar.php b/admin/views/causesrisks/tmpl/default_toolbar.php
index bf33f975..cde94b05 100644
--- a/admin/views/causesrisks/tmpl/default_toolbar.php
+++ b/admin/views/causesrisks/tmpl/default_toolbar.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/causesrisks/view.html.php b/admin/views/causesrisks/view.html.php
index 4fc2e004..8d64784d 100644
--- a/admin/views/causesrisks/view.html.php
+++ b/admin/views/causesrisks/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/combinedresults/tmpl/default.php b/admin/views/combinedresults/tmpl/default.php
index 25717d21..a993ffdf 100644
--- a/admin/views/combinedresults/tmpl/default.php
+++ b/admin/views/combinedresults/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/combinedresults/tmpl/default_chart_cost.php b/admin/views/combinedresults/tmpl/default_chart_cost.php
index 655e4afa..d4e44fc2 100644
--- a/admin/views/combinedresults/tmpl/default_chart_cost.php
+++ b/admin/views/combinedresults/tmpl/default_chart_cost.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost.php
diff --git a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php
index 79b64dd0..1779e258 100644
--- a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php
+++ b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost_percent.php
diff --git a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
index 3adf951a..002c981f 100644
--- a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
+++ b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_intervention_cost_benefit.php
diff --git a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php
index f9dee386..5775de43 100644
--- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php
+++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost.php
diff --git a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php
index d3221a39..cc1603f7 100644
--- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php
+++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost_percent.php
diff --git a/admin/views/combinedresults/tmpl/default_main.php b/admin/views/combinedresults/tmpl/default_main.php
index ccd5380d..f81120c0 100644
--- a/admin/views/combinedresults/tmpl/default_main.php
+++ b/admin/views/combinedresults/tmpl/default_main.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_main.php
diff --git a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php
index 77d8105e..23421943 100644
--- a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php
+++ b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_calculated_cost_in_detail.php
diff --git a/admin/views/combinedresults/tmpl/default_table_cost_summary.php b/admin/views/combinedresults/tmpl/default_table_cost_summary.php
index 5fb203f7..5ddbb8fc 100644
--- a/admin/views/combinedresults/tmpl/default_table_cost_summary.php
+++ b/admin/views/combinedresults/tmpl/default_table_cost_summary.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_cost_summary.php
diff --git a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
index 9bf1f034..3c5e97b4 100644
--- a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
+++ b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_intervention_net_benefit.php
diff --git a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php
index 0a7c299e..bb9d9dd2 100644
--- a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php
+++ b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_work_days_lost_summary.php
@@ -40,6 +40,7 @@ $scaled = array('unscaled','scaled');
 					<th width="11%" data-hide="phone,tablet"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DAYS_LOST_FEMALE_EMPLOYEES'); ?></th>
 					<th width="11%" data-hide="phone"><?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_PER_DISEASERISK_FACTOR'); ?></th>
 					<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_DAYS_LOST'); ?></th>
+					<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_ESTIMATED_BURDEN'); ?></th>
 					<th data-hide="all"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DATA'); ?></th>
 				</tr>        
 			</thead>                                    
@@ -54,6 +55,7 @@ $scaled = array('unscaled','scaled');
 					<td data-value='<?php echo $item->{'female_days_lost_'.$scale}; ?>' ><?php echo round($item->{'female_days_lost_'.$scale},3); ?></td>
 					<td data-value='<?php echo $item->{'subtotal_days_lost_'.$scale}; ?>' ><?php echo round($item->{'subtotal_days_lost_'.$scale},3); ?></td>
 					<td data-value='<?php echo ($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100; ?>' ><?php echo round(($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
+					<td data-value='<?php echo $item->subtotal_estimated_burden; ?>' ><?php echo round($item->subtotal_estimated_burden,3).'%'; ?></td>
 					<td data-value='0' ><?php $item->_tmpType = 'day'; $item->_tmpScale = $scale; echo JLayoutHelper::render('databreakdownmalefemale', $item); ?></td>
 				</tr>
 			<?php endforeach; ?>
@@ -68,6 +70,7 @@ $scaled = array('unscaled','scaled');
 					<td><?php echo round($this->results->totals->{'females_days_lost_'.$scale},3); ?></td>
 					<td><?php echo round($this->results->totals->{'total_days_lost_'.$scale},3); ?></td>
 					<td><?php echo round(($this->results->totals->{'total_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
+					<td><?php echo round($this->results->totals->total_estimated_burden,3).'%'; ?></td>
 					<td>&nbsp;&nbsp;</td>
 				</tr>
 			</tfoot>                                
diff --git a/admin/views/combinedresults/view.html.php b/admin/views/combinedresults/view.html.php
index 42daee5c..b2dd46ed 100644
--- a/admin/views/combinedresults/view.html.php
+++ b/admin/views/combinedresults/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/companies/tmpl/default.php b/admin/views/companies/tmpl/default.php
index 6088c8a3..8e903ebb 100644
--- a/admin/views/companies/tmpl/default.php
+++ b/admin/views/companies/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/companies/tmpl/default_batch_body.php b/admin/views/companies/tmpl/default_batch_body.php
index 6f9ed302..50c4dddc 100644
--- a/admin/views/companies/tmpl/default_batch_body.php
+++ b/admin/views/companies/tmpl/default_batch_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/companies/tmpl/default_batch_footer.php b/admin/views/companies/tmpl/default_batch_footer.php
index c8f33505..247cb36a 100644
--- a/admin/views/companies/tmpl/default_batch_footer.php
+++ b/admin/views/companies/tmpl/default_batch_footer.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/companies/tmpl/default_body.php b/admin/views/companies/tmpl/default_body.php
index 83b9fa9f..9dd71b1c 100644
--- a/admin/views/companies/tmpl/default_body.php
+++ b/admin/views/companies/tmpl/default_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/companies/tmpl/default_foot.php b/admin/views/companies/tmpl/default_foot.php
index d29c0bb4..4fabf8ce 100644
--- a/admin/views/companies/tmpl/default_foot.php
+++ b/admin/views/companies/tmpl/default_foot.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/companies/tmpl/default_head.php b/admin/views/companies/tmpl/default_head.php
index 3e109408..d497e6bb 100644
--- a/admin/views/companies/tmpl/default_head.php
+++ b/admin/views/companies/tmpl/default_head.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/companies/tmpl/default_toolbar.php b/admin/views/companies/tmpl/default_toolbar.php
index 701be4b9..37e00607 100644
--- a/admin/views/companies/tmpl/default_toolbar.php
+++ b/admin/views/companies/tmpl/default_toolbar.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/companies/view.html.php b/admin/views/companies/view.html.php
index c4700f41..5aab7940 100644
--- a/admin/views/companies/view.html.php
+++ b/admin/views/companies/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/company/submitbutton.js b/admin/views/company/submitbutton.js
index 83d79a71..bedbb8cf 100644
--- a/admin/views/company/submitbutton.js
+++ b/admin/views/company/submitbutton.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/company/tmpl/edit.php b/admin/views/company/tmpl/edit.php
index ec6061b9..6ba1a99a 100644
--- a/admin/views/company/tmpl/edit.php
+++ b/admin/views/company/tmpl/edit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
@@ -141,33 +141,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_department listeners for department_aoEEPbd function
+// #jform_department listeners for department_imCbNHF function
 jQuery('#jform_department').on('keyup',function()
 {
-	var department_aoEEPbd = jQuery("#jform_department input[type='radio']:checked").val();
-	aoEEPbd(department_aoEEPbd);
+	var department_imCbNHF = jQuery("#jform_department input[type='radio']:checked").val();
+	imCbNHF(department_imCbNHF);
 
 });
 jQuery('#adminForm').on('change', '#jform_department',function (e)
 {
 	e.preventDefault();
-	var department_aoEEPbd = jQuery("#jform_department input[type='radio']:checked").val();
-	aoEEPbd(department_aoEEPbd);
+	var department_imCbNHF = jQuery("#jform_department input[type='radio']:checked").val();
+	imCbNHF(department_imCbNHF);
 
 });
 
-// #jform_department listeners for department_lHOlbmV function
+// #jform_department listeners for department_HpJMxqK function
 jQuery('#jform_department').on('keyup',function()
 {
-	var department_lHOlbmV = jQuery("#jform_department input[type='radio']:checked").val();
-	lHOlbmV(department_lHOlbmV);
+	var department_HpJMxqK = jQuery("#jform_department input[type='radio']:checked").val();
+	HpJMxqK(department_HpJMxqK);
 
 });
 jQuery('#adminForm').on('change', '#jform_department',function (e)
 {
 	e.preventDefault();
-	var department_lHOlbmV = jQuery("#jform_department input[type='radio']:checked").val();
-	lHOlbmV(department_lHOlbmV);
+	var department_HpJMxqK = jQuery("#jform_department input[type='radio']:checked").val();
+	HpJMxqK(department_HpJMxqK);
 
 });
 
@@ -206,7 +206,10 @@ jQuery('#adminForm').on('change', '#jform_causesrisks',function (e)
 		}
 	});
 });
-jQuery('input.form-field-repeatable').on('weready', function(e, value){
+
+// add the calculator button
+var cal_button = ' <a class="btn btn-small btn-success" href="https://www.staffhealthcbp.com/download/Productivity_Losses_Calculator_V1.xlsx"> <span class="icon-download icon-white"></span> Calculator </a>';
+jQuery('#jform_productivity_losses').closest('.controls').append(cal_button);jQuery('input.form-field-repeatable').on('weready', function(e, value){
 	if ("jform_percentmale" == e.currentTarget.id)
 	{
 		calPercent('male');
diff --git a/admin/views/company/view.html.php b/admin/views/company/view.html.php
index 733328d6..b4478ea5 100644
--- a/admin/views/company/view.html.php
+++ b/admin/views/company/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -65,10 +65,10 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
                 }
 
 		// Get Linked view data
-		$this->onzscaling_factors		= $this->get('Onzscaling_factors');
+		$this->rxtscaling_factors		= $this->get('Rxtscaling_factors');
 
 		// Get Linked view data
-		$this->kqlinterventions		= $this->get('Kqlinterventions');
+		$this->eqzinterventions		= $this->get('Eqzinterventions');
 
 		// Set the toolbar
 		$this->addToolBar();
diff --git a/admin/views/companyresults/tmpl/default.php b/admin/views/companyresults/tmpl/default.php
index 1fbf31ef..0be7fcb5 100644
--- a/admin/views/companyresults/tmpl/default.php
+++ b/admin/views/companyresults/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/companyresults/tmpl/default_chart_cost.php b/admin/views/companyresults/tmpl/default_chart_cost.php
index 655e4afa..d4e44fc2 100644
--- a/admin/views/companyresults/tmpl/default_chart_cost.php
+++ b/admin/views/companyresults/tmpl/default_chart_cost.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost.php
diff --git a/admin/views/companyresults/tmpl/default_chart_cost_percent.php b/admin/views/companyresults/tmpl/default_chart_cost_percent.php
index 79b64dd0..1779e258 100644
--- a/admin/views/companyresults/tmpl/default_chart_cost_percent.php
+++ b/admin/views/companyresults/tmpl/default_chart_cost_percent.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost_percent.php
diff --git a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
index 3adf951a..002c981f 100644
--- a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
+++ b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_intervention_cost_benefit.php
diff --git a/admin/views/companyresults/tmpl/default_chart_work_days_lost.php b/admin/views/companyresults/tmpl/default_chart_work_days_lost.php
index f9dee386..5775de43 100644
--- a/admin/views/companyresults/tmpl/default_chart_work_days_lost.php
+++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost.php
diff --git a/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php b/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php
index d3221a39..cc1603f7 100644
--- a/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php
+++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost_percent.php
diff --git a/admin/views/companyresults/tmpl/default_main.php b/admin/views/companyresults/tmpl/default_main.php
index ccd5380d..f81120c0 100644
--- a/admin/views/companyresults/tmpl/default_main.php
+++ b/admin/views/companyresults/tmpl/default_main.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_main.php
diff --git a/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php b/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php
index 77d8105e..23421943 100644
--- a/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php
+++ b/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_calculated_cost_in_detail.php
diff --git a/admin/views/companyresults/tmpl/default_table_cost_summary.php b/admin/views/companyresults/tmpl/default_table_cost_summary.php
index 5fb203f7..5ddbb8fc 100644
--- a/admin/views/companyresults/tmpl/default_table_cost_summary.php
+++ b/admin/views/companyresults/tmpl/default_table_cost_summary.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_cost_summary.php
diff --git a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php
index 9bf1f034..3c5e97b4 100644
--- a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php
+++ b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_intervention_net_benefit.php
diff --git a/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php b/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php
index 0a7c299e..bb9d9dd2 100644
--- a/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php
+++ b/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_work_days_lost_summary.php
@@ -40,6 +40,7 @@ $scaled = array('unscaled','scaled');
 					<th width="11%" data-hide="phone,tablet"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DAYS_LOST_FEMALE_EMPLOYEES'); ?></th>
 					<th width="11%" data-hide="phone"><?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_PER_DISEASERISK_FACTOR'); ?></th>
 					<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_DAYS_LOST'); ?></th>
+					<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_ESTIMATED_BURDEN'); ?></th>
 					<th data-hide="all"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DATA'); ?></th>
 				</tr>        
 			</thead>                                    
@@ -54,6 +55,7 @@ $scaled = array('unscaled','scaled');
 					<td data-value='<?php echo $item->{'female_days_lost_'.$scale}; ?>' ><?php echo round($item->{'female_days_lost_'.$scale},3); ?></td>
 					<td data-value='<?php echo $item->{'subtotal_days_lost_'.$scale}; ?>' ><?php echo round($item->{'subtotal_days_lost_'.$scale},3); ?></td>
 					<td data-value='<?php echo ($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100; ?>' ><?php echo round(($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
+					<td data-value='<?php echo $item->subtotal_estimated_burden; ?>' ><?php echo round($item->subtotal_estimated_burden,3).'%'; ?></td>
 					<td data-value='0' ><?php $item->_tmpType = 'day'; $item->_tmpScale = $scale; echo JLayoutHelper::render('databreakdownmalefemale', $item); ?></td>
 				</tr>
 			<?php endforeach; ?>
@@ -68,6 +70,7 @@ $scaled = array('unscaled','scaled');
 					<td><?php echo round($this->results->totals->{'females_days_lost_'.$scale},3); ?></td>
 					<td><?php echo round($this->results->totals->{'total_days_lost_'.$scale},3); ?></td>
 					<td><?php echo round(($this->results->totals->{'total_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
+					<td><?php echo round($this->results->totals->total_estimated_burden,3).'%'; ?></td>
 					<td>&nbsp;&nbsp;</td>
 				</tr>
 			</tfoot>                                
diff --git a/admin/views/companyresults/tmpl/default_variables.php b/admin/views/companyresults/tmpl/default_variables.php
index fd45c522..02698d66 100644
--- a/admin/views/companyresults/tmpl/default_variables.php
+++ b/admin/views/companyresults/tmpl/default_variables.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_variables.php
diff --git a/admin/views/companyresults/view.html.php b/admin/views/companyresults/view.html.php
index 27eee28a..4ac27e80 100644
--- a/admin/views/companyresults/view.html.php
+++ b/admin/views/companyresults/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/costbenefitprojection/tmpl/default.php b/admin/views/costbenefitprojection/tmpl/default.php
index 8155bf91..f2d3329d 100644
--- a/admin/views/costbenefitprojection/tmpl/default.php
+++ b/admin/views/costbenefitprojection/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/costbenefitprojection/tmpl/default_main.php b/admin/views/costbenefitprojection/tmpl/default_main.php
index 6531f78c..1a91cb81 100644
--- a/admin/views/costbenefitprojection/tmpl/default_main.php
+++ b/admin/views/costbenefitprojection/tmpl/default_main.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_main.php
diff --git a/admin/views/costbenefitprojection/tmpl/default_vdm.php b/admin/views/costbenefitprojection/tmpl/default_vdm.php
index 45f7546a..b6cdeb68 100644
--- a/admin/views/costbenefitprojection/tmpl/default_vdm.php
+++ b/admin/views/costbenefitprojection/tmpl/default_vdm.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_vdm.php
diff --git a/admin/views/costbenefitprojection/view.html.php b/admin/views/costbenefitprojection/view.html.php
index ff45c79e..ddceef84 100644
--- a/admin/views/costbenefitprojection/view.html.php
+++ b/admin/views/costbenefitprojection/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/countries/tmpl/default.php b/admin/views/countries/tmpl/default.php
index efdba6e6..b424a590 100644
--- a/admin/views/countries/tmpl/default.php
+++ b/admin/views/countries/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/countries/tmpl/default_batch_body.php b/admin/views/countries/tmpl/default_batch_body.php
index 32b36810..e7309011 100644
--- a/admin/views/countries/tmpl/default_batch_body.php
+++ b/admin/views/countries/tmpl/default_batch_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/countries/tmpl/default_batch_footer.php b/admin/views/countries/tmpl/default_batch_footer.php
index a52b44c6..f251b15d 100644
--- a/admin/views/countries/tmpl/default_batch_footer.php
+++ b/admin/views/countries/tmpl/default_batch_footer.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/countries/tmpl/default_body.php b/admin/views/countries/tmpl/default_body.php
index f7764c60..b8371d59 100644
--- a/admin/views/countries/tmpl/default_body.php
+++ b/admin/views/countries/tmpl/default_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/countries/tmpl/default_foot.php b/admin/views/countries/tmpl/default_foot.php
index d29c0bb4..4fabf8ce 100644
--- a/admin/views/countries/tmpl/default_foot.php
+++ b/admin/views/countries/tmpl/default_foot.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/countries/tmpl/default_head.php b/admin/views/countries/tmpl/default_head.php
index 90965a40..d60a8ff3 100644
--- a/admin/views/countries/tmpl/default_head.php
+++ b/admin/views/countries/tmpl/default_head.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/countries/tmpl/default_toolbar.php b/admin/views/countries/tmpl/default_toolbar.php
index a25d6612..4ec4a496 100644
--- a/admin/views/countries/tmpl/default_toolbar.php
+++ b/admin/views/countries/tmpl/default_toolbar.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/countries/view.html.php b/admin/views/countries/view.html.php
index f601183c..d857993e 100644
--- a/admin/views/countries/view.html.php
+++ b/admin/views/countries/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/country/submitbutton.js b/admin/views/country/submitbutton.js
index 513dde80..77fd610e 100644
--- a/admin/views/country/submitbutton.js
+++ b/admin/views/country/submitbutton.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/country/tmpl/edit.php b/admin/views/country/tmpl/edit.php
index c69def21..34a6e2fc 100644
--- a/admin/views/country/tmpl/edit.php
+++ b/admin/views/country/tmpl/edit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
diff --git a/admin/views/country/view.html.php b/admin/views/country/view.html.php
index fd10bf77..1bcd1653 100644
--- a/admin/views/country/view.html.php
+++ b/admin/views/country/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -65,13 +65,13 @@ class CostbenefitprojectionViewCountry extends JViewLegacy
                 }
 
 		// Get Linked view data
-		$this->fyzinterventions		= $this->get('Fyzinterventions');
+		$this->tdlinterventions		= $this->get('Tdlinterventions');
 
 		// Get Linked view data
-		$this->mjwservice_providers		= $this->get('Mjwservice_providers');
+		$this->olaservice_providers		= $this->get('Olaservice_providers');
 
 		// Get Linked view data
-		$this->nnfcompanies		= $this->get('Nnfcompanies');
+		$this->juzcompanies		= $this->get('Juzcompanies');
 
 		// Set the toolbar
 		$this->addToolBar();
diff --git a/admin/views/currencies/tmpl/default.php b/admin/views/currencies/tmpl/default.php
index 1b37c43d..7fb7e79f 100644
--- a/admin/views/currencies/tmpl/default.php
+++ b/admin/views/currencies/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/currencies/tmpl/default_batch_body.php b/admin/views/currencies/tmpl/default_batch_body.php
index 24fc296e..638b651b 100644
--- a/admin/views/currencies/tmpl/default_batch_body.php
+++ b/admin/views/currencies/tmpl/default_batch_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/currencies/tmpl/default_batch_footer.php b/admin/views/currencies/tmpl/default_batch_footer.php
index 0b1eda5b..25363911 100644
--- a/admin/views/currencies/tmpl/default_batch_footer.php
+++ b/admin/views/currencies/tmpl/default_batch_footer.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/currencies/tmpl/default_body.php b/admin/views/currencies/tmpl/default_body.php
index a823a6bc..0eb7f881 100644
--- a/admin/views/currencies/tmpl/default_body.php
+++ b/admin/views/currencies/tmpl/default_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/currencies/tmpl/default_foot.php b/admin/views/currencies/tmpl/default_foot.php
index 2658c3af..71485d71 100644
--- a/admin/views/currencies/tmpl/default_foot.php
+++ b/admin/views/currencies/tmpl/default_foot.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/currencies/tmpl/default_head.php b/admin/views/currencies/tmpl/default_head.php
index 5f64ebf6..d2f6cfa0 100644
--- a/admin/views/currencies/tmpl/default_head.php
+++ b/admin/views/currencies/tmpl/default_head.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/currencies/tmpl/default_toolbar.php b/admin/views/currencies/tmpl/default_toolbar.php
index cf5bf2d5..73f6f409 100644
--- a/admin/views/currencies/tmpl/default_toolbar.php
+++ b/admin/views/currencies/tmpl/default_toolbar.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/currencies/view.html.php b/admin/views/currencies/view.html.php
index 446ab166..bd426e18 100644
--- a/admin/views/currencies/view.html.php
+++ b/admin/views/currencies/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/currency/submitbutton.js b/admin/views/currency/submitbutton.js
index 28e12856..9a4bfb2c 100644
--- a/admin/views/currency/submitbutton.js
+++ b/admin/views/currency/submitbutton.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/currency/tmpl/edit.php b/admin/views/currency/tmpl/edit.php
index 7a0a05e1..e179d36e 100644
--- a/admin/views/currency/tmpl/edit.php
+++ b/admin/views/currency/tmpl/edit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
diff --git a/admin/views/currency/view.html.php b/admin/views/currency/view.html.php
index 98b17d48..e015de2d 100644
--- a/admin/views/currency/view.html.php
+++ b/admin/views/currency/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/health_data/submitbutton.js b/admin/views/health_data/submitbutton.js
index 91dc0a0e..a37b2974 100644
--- a/admin/views/health_data/submitbutton.js
+++ b/admin/views/health_data/submitbutton.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/health_data/tmpl/edit.php b/admin/views/health_data/tmpl/edit.php
index 4c3fe317..5ae7b989 100644
--- a/admin/views/health_data/tmpl/edit.php
+++ b/admin/views/health_data/tmpl/edit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
diff --git a/admin/views/health_data/view.html.php b/admin/views/health_data/view.html.php
index 14fd19ec..c747b067 100644
--- a/admin/views/health_data/view.html.php
+++ b/admin/views/health_data/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/health_data_sets/tmpl/default.php b/admin/views/health_data_sets/tmpl/default.php
index cfbd4250..87ea5780 100644
--- a/admin/views/health_data_sets/tmpl/default.php
+++ b/admin/views/health_data_sets/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/health_data_sets/tmpl/default_batch_body.php b/admin/views/health_data_sets/tmpl/default_batch_body.php
index 3b91d948..af920a7e 100644
--- a/admin/views/health_data_sets/tmpl/default_batch_body.php
+++ b/admin/views/health_data_sets/tmpl/default_batch_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/health_data_sets/tmpl/default_batch_footer.php b/admin/views/health_data_sets/tmpl/default_batch_footer.php
index 32f6a632..b51c3a65 100644
--- a/admin/views/health_data_sets/tmpl/default_batch_footer.php
+++ b/admin/views/health_data_sets/tmpl/default_batch_footer.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/health_data_sets/tmpl/default_body.php b/admin/views/health_data_sets/tmpl/default_body.php
index 04ba7d61..2ec7e326 100644
--- a/admin/views/health_data_sets/tmpl/default_body.php
+++ b/admin/views/health_data_sets/tmpl/default_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/health_data_sets/tmpl/default_foot.php b/admin/views/health_data_sets/tmpl/default_foot.php
index 6917d741..8ab74725 100644
--- a/admin/views/health_data_sets/tmpl/default_foot.php
+++ b/admin/views/health_data_sets/tmpl/default_foot.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/health_data_sets/tmpl/default_head.php b/admin/views/health_data_sets/tmpl/default_head.php
index 4b2a1d4e..f4c91abb 100644
--- a/admin/views/health_data_sets/tmpl/default_head.php
+++ b/admin/views/health_data_sets/tmpl/default_head.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/health_data_sets/tmpl/default_toolbar.php b/admin/views/health_data_sets/tmpl/default_toolbar.php
index 762e8ac6..0ab09c3b 100644
--- a/admin/views/health_data_sets/tmpl/default_toolbar.php
+++ b/admin/views/health_data_sets/tmpl/default_toolbar.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/health_data_sets/view.html.php b/admin/views/health_data_sets/view.html.php
index 29903526..1cd80306 100644
--- a/admin/views/health_data_sets/view.html.php
+++ b/admin/views/health_data_sets/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js
index 4a391c49..8c3fcd76 100644
--- a/admin/views/help_document/submitbutton.js
+++ b/admin/views/help_document/submitbutton.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php
index 247363f0..429074c3 100644
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
@@ -96,93 +96,93 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_location listeners for location_wbXluyd function
+// #jform_location listeners for location_HSNKYXL function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_wbXluyd = jQuery("#jform_location input[type='radio']:checked").val();
-	wbXluyd(location_wbXluyd);
+	var location_HSNKYXL = jQuery("#jform_location input[type='radio']:checked").val();
+	HSNKYXL(location_HSNKYXL);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_wbXluyd = jQuery("#jform_location input[type='radio']:checked").val();
-	wbXluyd(location_wbXluyd);
+	var location_HSNKYXL = jQuery("#jform_location input[type='radio']:checked").val();
+	HSNKYXL(location_HSNKYXL);
 
 });
 
-// #jform_location listeners for location_uuUtMWc function
+// #jform_location listeners for location_qeWtANs function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_uuUtMWc = jQuery("#jform_location input[type='radio']:checked").val();
-	uuUtMWc(location_uuUtMWc);
+	var location_qeWtANs = jQuery("#jform_location input[type='radio']:checked").val();
+	qeWtANs(location_qeWtANs);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_uuUtMWc = jQuery("#jform_location input[type='radio']:checked").val();
-	uuUtMWc(location_uuUtMWc);
+	var location_qeWtANs = jQuery("#jform_location input[type='radio']:checked").val();
+	qeWtANs(location_qeWtANs);
 
 });
 
-// #jform_type listeners for type_UJteXUt function
+// #jform_type listeners for type_nBdbRfD function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_UJteXUt = jQuery("#jform_type").val();
-	UJteXUt(type_UJteXUt);
+	var type_nBdbRfD = jQuery("#jform_type").val();
+	nBdbRfD(type_nBdbRfD);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_UJteXUt = jQuery("#jform_type").val();
-	UJteXUt(type_UJteXUt);
+	var type_nBdbRfD = jQuery("#jform_type").val();
+	nBdbRfD(type_nBdbRfD);
 
 });
 
-// #jform_type listeners for type_QEIUlDz function
+// #jform_type listeners for type_typoIBt function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_QEIUlDz = jQuery("#jform_type").val();
-	QEIUlDz(type_QEIUlDz);
+	var type_typoIBt = jQuery("#jform_type").val();
+	typoIBt(type_typoIBt);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_QEIUlDz = jQuery("#jform_type").val();
-	QEIUlDz(type_QEIUlDz);
+	var type_typoIBt = jQuery("#jform_type").val();
+	typoIBt(type_typoIBt);
 
 });
 
-// #jform_type listeners for type_TReWnxQ function
+// #jform_type listeners for type_escOQgL function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_TReWnxQ = jQuery("#jform_type").val();
-	TReWnxQ(type_TReWnxQ);
+	var type_escOQgL = jQuery("#jform_type").val();
+	escOQgL(type_escOQgL);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_TReWnxQ = jQuery("#jform_type").val();
-	TReWnxQ(type_TReWnxQ);
+	var type_escOQgL = jQuery("#jform_type").val();
+	escOQgL(type_escOQgL);
 
 });
 
-// #jform_target listeners for target_LjCaoAT function
+// #jform_target listeners for target_ENSCNMH function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_LjCaoAT = jQuery("#jform_target input[type='radio']:checked").val();
-	LjCaoAT(target_LjCaoAT);
+	var target_ENSCNMH = jQuery("#jform_target input[type='radio']:checked").val();
+	ENSCNMH(target_ENSCNMH);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_LjCaoAT = jQuery("#jform_target input[type='radio']:checked").val();
-	LjCaoAT(target_LjCaoAT);
+	var target_ENSCNMH = jQuery("#jform_target input[type='radio']:checked").val();
+	ENSCNMH(target_ENSCNMH);
 
 });
 
diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php
index 4da00568..467f0837 100644
--- a/admin/views/help_document/view.html.php
+++ b/admin/views/help_document/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php
index 4af7a487..dd8cf36c 100644
--- a/admin/views/help_documents/tmpl/default.php
+++ b/admin/views/help_documents/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php
index 0fb3dca5..b258478d 100644
--- a/admin/views/help_documents/tmpl/default_batch_body.php
+++ b/admin/views/help_documents/tmpl/default_batch_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php
index 2ae0ebb6..84660240 100644
--- a/admin/views/help_documents/tmpl/default_batch_footer.php
+++ b/admin/views/help_documents/tmpl/default_batch_footer.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php
index 676a661d..f0aa6889 100644
--- a/admin/views/help_documents/tmpl/default_body.php
+++ b/admin/views/help_documents/tmpl/default_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php
index d29c0bb4..4fabf8ce 100644
--- a/admin/views/help_documents/tmpl/default_foot.php
+++ b/admin/views/help_documents/tmpl/default_foot.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php
index 1d1f764a..971ca4e1 100644
--- a/admin/views/help_documents/tmpl/default_head.php
+++ b/admin/views/help_documents/tmpl/default_head.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php
index 287ee19a..2e53d7c4 100644
--- a/admin/views/help_documents/tmpl/default_toolbar.php
+++ b/admin/views/help_documents/tmpl/default_toolbar.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php
index 03061346..387268af 100644
--- a/admin/views/help_documents/view.html.php
+++ b/admin/views/help_documents/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php
index 962f620e..0ed961e6 100644
--- a/admin/views/import/tmpl/default.php
+++ b/admin/views/import/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php
index 4d909e4f..8fca8c17 100644
--- a/admin/views/import/view.html.php
+++ b/admin/views/import/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/intervention/submitbutton.js b/admin/views/intervention/submitbutton.js
index e9328a5e..f2a455f4 100644
--- a/admin/views/intervention/submitbutton.js
+++ b/admin/views/intervention/submitbutton.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/intervention/tmpl/edit.php b/admin/views/intervention/tmpl/edit.php
index 961f0fc3..9a0f2700 100644
--- a/admin/views/intervention/tmpl/edit.php
+++ b/admin/views/intervention/tmpl/edit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
@@ -103,48 +103,48 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_type listeners for type_mHPeTPU function
+// #jform_type listeners for type_hjWzglc function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_mHPeTPU = jQuery("#jform_type input[type='radio']:checked").val();
-	mHPeTPU(type_mHPeTPU);
+	var type_hjWzglc = jQuery("#jform_type input[type='radio']:checked").val();
+	hjWzglc(type_hjWzglc);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_mHPeTPU = jQuery("#jform_type input[type='radio']:checked").val();
-	mHPeTPU(type_mHPeTPU);
+	var type_hjWzglc = jQuery("#jform_type input[type='radio']:checked").val();
+	hjWzglc(type_hjWzglc);
 
 });
 
-// #jform_type listeners for type_iOljoGp function
+// #jform_type listeners for type_KIPRxZv function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_iOljoGp = jQuery("#jform_type input[type='radio']:checked").val();
-	iOljoGp(type_iOljoGp);
+	var type_KIPRxZv = jQuery("#jform_type input[type='radio']:checked").val();
+	KIPRxZv(type_KIPRxZv);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_iOljoGp = jQuery("#jform_type input[type='radio']:checked").val();
-	iOljoGp(type_iOljoGp);
+	var type_KIPRxZv = jQuery("#jform_type input[type='radio']:checked").val();
+	KIPRxZv(type_KIPRxZv);
 
 });
 
-// #jform_company listeners for company_imgMwkf function
+// #jform_company listeners for company_QhXOtTU function
 jQuery('#jform_company').on('keyup',function()
 {
-	var company_imgMwkf = jQuery("#jform_company").val();
-	imgMwkf(company_imgMwkf);
+	var company_QhXOtTU = jQuery("#jform_company").val();
+	QhXOtTU(company_QhXOtTU);
 
 });
 jQuery('#adminForm').on('change', '#jform_company',function (e)
 {
 	e.preventDefault();
-	var company_imgMwkf = jQuery("#jform_company").val();
-	imgMwkf(company_imgMwkf);
+	var company_QhXOtTU = jQuery("#jform_company").val();
+	QhXOtTU(company_QhXOtTU);
 
 });
 
diff --git a/admin/views/intervention/view.html.php b/admin/views/intervention/view.html.php
index 2f122375..50a467f6 100644
--- a/admin/views/intervention/view.html.php
+++ b/admin/views/intervention/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/interventions/tmpl/default.php b/admin/views/interventions/tmpl/default.php
index d27d9ec6..046a9bb0 100644
--- a/admin/views/interventions/tmpl/default.php
+++ b/admin/views/interventions/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/interventions/tmpl/default_batch_body.php b/admin/views/interventions/tmpl/default_batch_body.php
index 635974ab..11ae1ebd 100644
--- a/admin/views/interventions/tmpl/default_batch_body.php
+++ b/admin/views/interventions/tmpl/default_batch_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/interventions/tmpl/default_batch_footer.php b/admin/views/interventions/tmpl/default_batch_footer.php
index 51a6dfc0..6422c852 100644
--- a/admin/views/interventions/tmpl/default_batch_footer.php
+++ b/admin/views/interventions/tmpl/default_batch_footer.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/interventions/tmpl/default_body.php b/admin/views/interventions/tmpl/default_body.php
index 2ceeee01..5e1a04b9 100644
--- a/admin/views/interventions/tmpl/default_body.php
+++ b/admin/views/interventions/tmpl/default_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/interventions/tmpl/default_foot.php b/admin/views/interventions/tmpl/default_foot.php
index d29c0bb4..4fabf8ce 100644
--- a/admin/views/interventions/tmpl/default_foot.php
+++ b/admin/views/interventions/tmpl/default_foot.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/interventions/tmpl/default_head.php b/admin/views/interventions/tmpl/default_head.php
index 75b6433f..b5dc0422 100644
--- a/admin/views/interventions/tmpl/default_head.php
+++ b/admin/views/interventions/tmpl/default_head.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/interventions/tmpl/default_toolbar.php b/admin/views/interventions/tmpl/default_toolbar.php
index f17b8f00..cd1dec44 100644
--- a/admin/views/interventions/tmpl/default_toolbar.php
+++ b/admin/views/interventions/tmpl/default_toolbar.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/interventions/view.html.php b/admin/views/interventions/view.html.php
index 1e4c48aa..928ea774 100644
--- a/admin/views/interventions/view.html.php
+++ b/admin/views/interventions/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/scaling_factor/submitbutton.js b/admin/views/scaling_factor/submitbutton.js
index a74c51be..fa967060 100644
--- a/admin/views/scaling_factor/submitbutton.js
+++ b/admin/views/scaling_factor/submitbutton.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/scaling_factor/tmpl/edit.php b/admin/views/scaling_factor/tmpl/edit.php
index 2ef05b81..8460c166 100644
--- a/admin/views/scaling_factor/tmpl/edit.php
+++ b/admin/views/scaling_factor/tmpl/edit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
@@ -88,18 +88,18 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_company listeners for company_cfzxGEC function
+// #jform_company listeners for company_gXgQwdA function
 jQuery('#jform_company').on('keyup',function()
 {
-	var company_cfzxGEC = jQuery("#jform_company").val();
-	cfzxGEC(company_cfzxGEC);
+	var company_gXgQwdA = jQuery("#jform_company").val();
+	gXgQwdA(company_gXgQwdA);
 
 });
 jQuery('#adminForm').on('change', '#jform_company',function (e)
 {
 	e.preventDefault();
-	var company_cfzxGEC = jQuery("#jform_company").val();
-	cfzxGEC(company_cfzxGEC);
+	var company_gXgQwdA = jQuery("#jform_company").val();
+	gXgQwdA(company_gXgQwdA);
 
 });
 
diff --git a/admin/views/scaling_factor/view.html.php b/admin/views/scaling_factor/view.html.php
index f616be06..626d805d 100644
--- a/admin/views/scaling_factor/view.html.php
+++ b/admin/views/scaling_factor/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/scaling_factors/tmpl/default.php b/admin/views/scaling_factors/tmpl/default.php
index a3448806..aa77cfa8 100644
--- a/admin/views/scaling_factors/tmpl/default.php
+++ b/admin/views/scaling_factors/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/scaling_factors/tmpl/default_batch_body.php b/admin/views/scaling_factors/tmpl/default_batch_body.php
index 1dfb33dc..fbeeec02 100644
--- a/admin/views/scaling_factors/tmpl/default_batch_body.php
+++ b/admin/views/scaling_factors/tmpl/default_batch_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/scaling_factors/tmpl/default_batch_footer.php b/admin/views/scaling_factors/tmpl/default_batch_footer.php
index 5f93641c..13abf2e2 100644
--- a/admin/views/scaling_factors/tmpl/default_batch_footer.php
+++ b/admin/views/scaling_factors/tmpl/default_batch_footer.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/scaling_factors/tmpl/default_body.php b/admin/views/scaling_factors/tmpl/default_body.php
index e9063604..19f9e1b4 100644
--- a/admin/views/scaling_factors/tmpl/default_body.php
+++ b/admin/views/scaling_factors/tmpl/default_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/scaling_factors/tmpl/default_foot.php b/admin/views/scaling_factors/tmpl/default_foot.php
index e7715070..87dec2f5 100644
--- a/admin/views/scaling_factors/tmpl/default_foot.php
+++ b/admin/views/scaling_factors/tmpl/default_foot.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/scaling_factors/tmpl/default_head.php b/admin/views/scaling_factors/tmpl/default_head.php
index 6360e6c0..ddf9512b 100644
--- a/admin/views/scaling_factors/tmpl/default_head.php
+++ b/admin/views/scaling_factors/tmpl/default_head.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/scaling_factors/tmpl/default_toolbar.php b/admin/views/scaling_factors/tmpl/default_toolbar.php
index e3366b64..b4f3768d 100644
--- a/admin/views/scaling_factors/tmpl/default_toolbar.php
+++ b/admin/views/scaling_factors/tmpl/default_toolbar.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/scaling_factors/view.html.php b/admin/views/scaling_factors/view.html.php
index 89c80cd5..b1192b36 100644
--- a/admin/views/scaling_factors/view.html.php
+++ b/admin/views/scaling_factors/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/admin/views/service_provider/submitbutton.js b/admin/views/service_provider/submitbutton.js
index cecb3f63..40bf057e 100644
--- a/admin/views/service_provider/submitbutton.js
+++ b/admin/views/service_provider/submitbutton.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/admin/views/service_provider/tmpl/edit.php b/admin/views/service_provider/tmpl/edit.php
index 5d52056f..78a88145 100644
--- a/admin/views/service_provider/tmpl/edit.php
+++ b/admin/views/service_provider/tmpl/edit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
diff --git a/admin/views/service_provider/view.html.php b/admin/views/service_provider/view.html.php
index ec753bae..536a3bf2 100644
--- a/admin/views/service_provider/view.html.php
+++ b/admin/views/service_provider/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -65,7 +65,7 @@ class CostbenefitprojectionViewService_provider extends JViewLegacy
                 }
 
 		// Get Linked view data
-		$this->rtncompanies		= $this->get('Rtncompanies');
+		$this->srvcompanies		= $this->get('Srvcompanies');
 
 		// Set the toolbar
 		$this->addToolBar();
diff --git a/admin/views/service_providers/tmpl/default.php b/admin/views/service_providers/tmpl/default.php
index ebd5a1cb..a217fbee 100644
--- a/admin/views/service_providers/tmpl/default.php
+++ b/admin/views/service_providers/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/admin/views/service_providers/tmpl/default_batch_body.php b/admin/views/service_providers/tmpl/default_batch_body.php
index 74dc95b3..729eae47 100644
--- a/admin/views/service_providers/tmpl/default_batch_body.php
+++ b/admin/views/service_providers/tmpl/default_batch_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php
diff --git a/admin/views/service_providers/tmpl/default_batch_footer.php b/admin/views/service_providers/tmpl/default_batch_footer.php
index 21afa81a..f1a38520 100644
--- a/admin/views/service_providers/tmpl/default_batch_footer.php
+++ b/admin/views/service_providers/tmpl/default_batch_footer.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/service_providers/tmpl/default_body.php b/admin/views/service_providers/tmpl/default_body.php
index 3ad74431..969259f5 100644
--- a/admin/views/service_providers/tmpl/default_body.php
+++ b/admin/views/service_providers/tmpl/default_body.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php
diff --git a/admin/views/service_providers/tmpl/default_foot.php b/admin/views/service_providers/tmpl/default_foot.php
index d29c0bb4..4fabf8ce 100644
--- a/admin/views/service_providers/tmpl/default_foot.php
+++ b/admin/views/service_providers/tmpl/default_foot.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php
diff --git a/admin/views/service_providers/tmpl/default_head.php b/admin/views/service_providers/tmpl/default_head.php
index bc3b659a..f32880b7 100644
--- a/admin/views/service_providers/tmpl/default_head.php
+++ b/admin/views/service_providers/tmpl/default_head.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php
diff --git a/admin/views/service_providers/tmpl/default_toolbar.php b/admin/views/service_providers/tmpl/default_toolbar.php
index 244d0220..df4396fe 100644
--- a/admin/views/service_providers/tmpl/default_toolbar.php
+++ b/admin/views/service_providers/tmpl/default_toolbar.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php
diff --git a/admin/views/service_providers/view.html.php b/admin/views/service_providers/view.html.php
index 6a42f4d8..68f5062c 100644
--- a/admin/views/service_providers/view.html.php
+++ b/admin/views/service_providers/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/costbenefitprojection.xml b/costbenefitprojection.xml
index 51e1f4cd..620142be 100644
--- a/costbenefitprojection.xml
+++ b/costbenefitprojection.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COSTBENEFITPROJECTION</name>
-	<creationDate>14th February, 2016</creationDate>
+	<creationDate>16th February, 2016</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@vdm.io</authorEmail>
 	<authorUrl>http://www.vdm.io</authorUrl>
 	<copyright>Copyright (C) 2015. All Rights Reserved</copyright>
 	<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
-	<version>3.3.0</version>
+	<version>3.3.2</version>
 	<description><![CDATA[
-		<h1>Cost Benefit Projection (v.3.3.0)</h1>
+		<h1>Cost Benefit Projection (v.3.3.2)</h1>
 		<div style="clear: both;"></div>
 		<p>[Create Epidemiological Profiles] (https://www.staffhealthcbp.com/) for diseases and risks affecting your company. Detailed information on projected work days lost and costs. Create and edit activities and wellness responses for your workplace. Access to Small Business Modelling. Results displayed by gender. Network with other companies and wellness professionals.
 
diff --git a/script.php b/script.php
index 78c48feb..56b035aa 100644
--- a/script.php
+++ b/script.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		script.php
@@ -1300,7 +1300,7 @@ class com_costbenefitprojectionInstallerScript
 			echo '<a target="_blank" href="http://www.vdm.io" title="Cost Benefit Projection">
 				<img src="components/com_costbenefitprojection/assets/images/component-300.png"/>
 				</a>
-				<h3>Upgrade to Version 3.3.0 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 3.3.2 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}
 }
diff --git a/site/assets/css/combinedresults.css b/site/assets/css/combinedresults.css
index d8400194..19d39011 100644
--- a/site/assets/css/combinedresults.css
+++ b/site/assets/css/combinedresults.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		combinedresults.css
diff --git a/site/assets/css/company.css b/site/assets/css/company.css
index 11886af7..4a016abd 100644
--- a/site/assets/css/company.css
+++ b/site/assets/css/company.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.css
diff --git a/site/assets/css/companyresults.css b/site/assets/css/companyresults.css
index c12e0371..477b34ec 100644
--- a/site/assets/css/companyresults.css
+++ b/site/assets/css/companyresults.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companyresults.css
diff --git a/site/assets/css/cpanel.css b/site/assets/css/cpanel.css
index 09305f15..70567107 100644
--- a/site/assets/css/cpanel.css
+++ b/site/assets/css/cpanel.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		cpanel.css
diff --git a/site/assets/css/createaccount.css b/site/assets/css/createaccount.css
index 33ed9de9..d253591e 100644
--- a/site/assets/css/createaccount.css
+++ b/site/assets/css/createaccount.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		createaccount.css
diff --git a/site/assets/css/intervention.css b/site/assets/css/intervention.css
index 02eefc77..690bdd0c 100644
--- a/site/assets/css/intervention.css
+++ b/site/assets/css/intervention.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.css
diff --git a/site/assets/css/publicresults.css b/site/assets/css/publicresults.css
index 617818ce..6b25227b 100644
--- a/site/assets/css/publicresults.css
+++ b/site/assets/css/publicresults.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publicresults.css
diff --git a/site/assets/css/scaling_factor.css b/site/assets/css/scaling_factor.css
index b988cf25..f50b5335 100644
--- a/site/assets/css/scaling_factor.css
+++ b/site/assets/css/scaling_factor.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.css
diff --git a/site/assets/css/site.css b/site/assets/css/site.css
index 0ca76ff7..700cce59 100644
--- a/site/assets/css/site.css
+++ b/site/assets/css/site.css
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		site.css
diff --git a/site/controller.php b/site/controller.php
index 828195ff..07463fb1 100644
--- a/site/controller.php
+++ b/site/controller.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		controller.php
diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php
index f32c6838..29b7b858 100644
--- a/site/controllers/ajax.json.php
+++ b/site/controllers/ajax.json.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		ajax.json.php
diff --git a/site/controllers/company.php b/site/controllers/company.php
index 3d47dfd3..04e323f2 100644
--- a/site/controllers/company.php
+++ b/site/controllers/company.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.php
diff --git a/site/controllers/help.php b/site/controllers/help.php
index b6b9ab61..d41a2987 100644
--- a/site/controllers/help.php
+++ b/site/controllers/help.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help.php
diff --git a/site/controllers/intervention.php b/site/controllers/intervention.php
index 1e08a9ce..46ba8f01 100644
--- a/site/controllers/intervention.php
+++ b/site/controllers/intervention.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.php
diff --git a/site/controllers/scaling_factor.php b/site/controllers/scaling_factor.php
index 5e7b872c..6f86326f 100644
--- a/site/controllers/scaling_factor.php
+++ b/site/controllers/scaling_factor.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.php
diff --git a/site/costbenefitprojection.php b/site/costbenefitprojection.php
index 3beef7d4..3acadb79 100644
--- a/site/costbenefitprojection.php
+++ b/site/costbenefitprojection.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
diff --git a/site/helpers/costbenefitprojection.php b/site/helpers/costbenefitprojection.php
index 5a4d3a0c..1478312b 100644
--- a/site/helpers/costbenefitprojection.php
+++ b/site/helpers/costbenefitprojection.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php
index 9c6a8b07..3dfa38aa 100644
--- a/site/helpers/headercheck.php
+++ b/site/helpers/headercheck.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		headercheck.php
diff --git a/site/helpers/route.php b/site/helpers/route.php
index bb149c93..655ffef7 100644
--- a/site/helpers/route.php
+++ b/site/helpers/route.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		route.php
diff --git a/site/language/en-GB/en-GB.com_costbenefitprojection.ini b/site/language/en-GB/en-GB.com_costbenefitprojection.ini
index 828d9fb8..06763599 100644
--- a/site/language/en-GB/en-GB.com_costbenefitprojection.ini
+++ b/site/language/en-GB/en-GB.com_costbenefitprojection.ini
@@ -1209,6 +1209,7 @@ COM_COSTBENEFITPROJECTION_ONLY_ME="Only Me"
 COM_COSTBENEFITPROJECTION_OPEN_FREE_ACCOUNT_NOW="Open free account now!"
 COM_COSTBENEFITPROJECTION_PA_SERVICE_PROVIDER_OR_COUNTRY_ADMINISTRATOR_MUST_SETUP_AN_ACCOUNT_FOR_YOUPPTHEREFORE_PLEASE_SELECT_YOUR_COUNTRY_AND_PREFERRED_SERVICE_PROVIDER_SHOULD_YOU_BE_UNSURE_WHICH_SERVICE_PROVIDER_TO_CONTACT_YOU_CAN_SIMPLY_CONTACT_THE_COUNTRY_ADMINISTRATORP="<p>A service provider or country administrator must setup an account for you!</p><p>Therefore please select your country, and preferred service provider. Should you be unsure which service provider to contact, you can simply contact the country administrator</p>"
 COM_COSTBENEFITPROJECTION_PERCENT="Percent"
+COM_COSTBENEFITPROJECTION_PERCENT_OF_ESTIMATED_BURDEN="Percent of Estimated Burden"
 COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_COST="Percent of Total Cost"
 COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_DAYS_LOST="Percent of Total Days Lost"
 COM_COSTBENEFITPROJECTION_PLEASE_PUBLISH_A_MODULE_TO_SPAN_CLASS_UKTEXTBOLD_PUBLICCOSTNOTE_SPAN_POSITION_OF_THIS_PAGE_WITH_YOUR_PUBLIC_NOTICE_TEXT="Please publish a module to [<span class ="uk-text-bold"> publicCostNote </span>] position of this page with your public notice text!"
diff --git a/site/layouts/appnotice.php b/site/layouts/appnotice.php
index 169f201e..772d4a47 100644
--- a/site/layouts/appnotice.php
+++ b/site/layouts/appnotice.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		appnotice.php
diff --git a/site/layouts/company/age_groups_percentages_fullwidth.php b/site/layouts/company/age_groups_percentages_fullwidth.php
index 8e096960..cf788d00 100644
--- a/site/layouts/company/age_groups_percentages_fullwidth.php
+++ b/site/layouts/company/age_groups_percentages_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_fullwidth.php
diff --git a/site/layouts/company/age_groups_percentages_left.php b/site/layouts/company/age_groups_percentages_left.php
index c5fbf84b..afe2d8ba 100644
--- a/site/layouts/company/age_groups_percentages_left.php
+++ b/site/layouts/company/age_groups_percentages_left.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_left.php
diff --git a/site/layouts/company/age_groups_percentages_right.php b/site/layouts/company/age_groups_percentages_right.php
index 92ca5dee..873fe0e6 100644
--- a/site/layouts/company/age_groups_percentages_right.php
+++ b/site/layouts/company/age_groups_percentages_right.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_right.php
diff --git a/site/layouts/company/causerisk_selection_fullwidth.php b/site/layouts/company/causerisk_selection_fullwidth.php
index 7353b330..2194a740 100644
--- a/site/layouts/company/causerisk_selection_fullwidth.php
+++ b/site/layouts/company/causerisk_selection_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk_selection_fullwidth.php
diff --git a/site/layouts/company/details_above.php b/site/layouts/company/details_above.php
index 50bd145c..ee6c8f58 100644
--- a/site/layouts/company/details_above.php
+++ b/site/layouts/company/details_above.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/site/layouts/company/details_left.php b/site/layouts/company/details_left.php
index d44b7696..a8976882 100644
--- a/site/layouts/company/details_left.php
+++ b/site/layouts/company/details_left.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/site/layouts/company/details_right.php b/site/layouts/company/details_right.php
index da23cf01..d1e21191 100644
--- a/site/layouts/company/details_right.php
+++ b/site/layouts/company/details_right.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/site/layouts/company/details_under.php b/site/layouts/company/details_under.php
index 5ee62174..e3abec90 100644
--- a/site/layouts/company/details_under.php
+++ b/site/layouts/company/details_under.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_under.php
diff --git a/site/layouts/company/interventions_fullwidth.php b/site/layouts/company/interventions_fullwidth.php
index 1f6e0498..bf0ad2d9 100644
--- a/site/layouts/company/interventions_fullwidth.php
+++ b/site/layouts/company/interventions_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions_fullwidth.php
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->kqlinterventions;
+$items	= $displayData->eqzinterventions;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit";
diff --git a/site/layouts/company/publishing.php b/site/layouts/company/publishing.php
index 7a72e83a..a2b6b2e9 100644
--- a/site/layouts/company/publishing.php
+++ b/site/layouts/company/publishing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/site/layouts/company/publlshing.php b/site/layouts/company/publlshing.php
index 8d441276..9fb584ab 100644
--- a/site/layouts/company/publlshing.php
+++ b/site/layouts/company/publlshing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/site/layouts/company/scaling_factors_fullwidth.php b/site/layouts/company/scaling_factors_fullwidth.php
index fb593e66..276cc8f5 100644
--- a/site/layouts/company/scaling_factors_fullwidth.php
+++ b/site/layouts/company/scaling_factors_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors_fullwidth.php
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->onzscaling_factors;
+$items	= $displayData->rxtscaling_factors;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=scaling_factors&task=scaling_factor.edit";
diff --git a/site/layouts/companydetails.php b/site/layouts/companydetails.php
index f292275d..890f52fe 100644
--- a/site/layouts/companydetails.php
+++ b/site/layouts/companydetails.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companydetails.php
diff --git a/site/layouts/databreakdownmalefemale.php b/site/layouts/databreakdownmalefemale.php
index ba510d79..ea88e191 100644
--- a/site/layouts/databreakdownmalefemale.php
+++ b/site/layouts/databreakdownmalefemale.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		databreakdownmalefemale.php
diff --git a/site/layouts/intervention/details_above.php b/site/layouts/intervention/details_above.php
index 95a12048..07eefa0b 100644
--- a/site/layouts/intervention/details_above.php
+++ b/site/layouts/intervention/details_above.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/site/layouts/intervention/details_fullwidth.php b/site/layouts/intervention/details_fullwidth.php
index 007f669f..f7e77c71 100644
--- a/site/layouts/intervention/details_fullwidth.php
+++ b/site/layouts/intervention/details_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_fullwidth.php
diff --git a/site/layouts/intervention/details_under.php b/site/layouts/intervention/details_under.php
index 5ee62174..e3abec90 100644
--- a/site/layouts/intervention/details_under.php
+++ b/site/layouts/intervention/details_under.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_under.php
diff --git a/site/layouts/intervention/publishing.php b/site/layouts/intervention/publishing.php
index 7a72e83a..a2b6b2e9 100644
--- a/site/layouts/intervention/publishing.php
+++ b/site/layouts/intervention/publishing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/site/layouts/intervention/publlshing.php b/site/layouts/intervention/publlshing.php
index df96a073..6a0d53f8 100644
--- a/site/layouts/intervention/publlshing.php
+++ b/site/layouts/intervention/publlshing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/site/layouts/intervention/settings_fullwidth.php b/site/layouts/intervention/settings_fullwidth.php
index e786c5de..0a8e4c96 100644
--- a/site/layouts/intervention/settings_fullwidth.php
+++ b/site/layouts/intervention/settings_fullwidth.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		settings_fullwidth.php
diff --git a/site/layouts/intervention/settings_left.php b/site/layouts/intervention/settings_left.php
index dd8a01f9..58621b5c 100644
--- a/site/layouts/intervention/settings_left.php
+++ b/site/layouts/intervention/settings_left.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		settings_left.php
diff --git a/site/layouts/scaling_factor/details_above.php b/site/layouts/scaling_factor/details_above.php
index 2788a921..c935b3ef 100644
--- a/site/layouts/scaling_factor/details_above.php
+++ b/site/layouts/scaling_factor/details_above.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
diff --git a/site/layouts/scaling_factor/details_left.php b/site/layouts/scaling_factor/details_left.php
index 90a43a94..712b5aa8 100644
--- a/site/layouts/scaling_factor/details_left.php
+++ b/site/layouts/scaling_factor/details_left.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
diff --git a/site/layouts/scaling_factor/details_right.php b/site/layouts/scaling_factor/details_right.php
index 208fad2d..14d0ae5d 100644
--- a/site/layouts/scaling_factor/details_right.php
+++ b/site/layouts/scaling_factor/details_right.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
diff --git a/site/layouts/scaling_factor/publishing.php b/site/layouts/scaling_factor/publishing.php
index 7a72e83a..a2b6b2e9 100644
--- a/site/layouts/scaling_factor/publishing.php
+++ b/site/layouts/scaling_factor/publishing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
diff --git a/site/layouts/scaling_factor/publlshing.php b/site/layouts/scaling_factor/publlshing.php
index df96a073..6a0d53f8 100644
--- a/site/layouts/scaling_factor/publlshing.php
+++ b/site/layouts/scaling_factor/publlshing.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
diff --git a/site/models/ajax.php b/site/models/ajax.php
index fac94529..c59c2399 100644
--- a/site/models/ajax.php
+++ b/site/models/ajax.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		ajax.php
diff --git a/site/models/combinedresults.php b/site/models/combinedresults.php
index 8ef33c16..6b2281fc 100644
--- a/site/models/combinedresults.php
+++ b/site/models/combinedresults.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		combinedresults.php
diff --git a/site/models/company.php b/site/models/company.php
index 26287b45..9686a4fe 100644
--- a/site/models/company.php
+++ b/site/models/company.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.php
@@ -154,8 +154,8 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_costbenefitprojection.company');
 			}
 		}
-		$this->companyjniw = $item->id;
-		$this->companylssr = $item->id;
+		$this->companykjdf = $item->id;
+		$this->companydomr = $item->id;
 
 		return $item;
 	}
@@ -165,7 +165,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getOnzscaling_factors()
+	public function getRxtscaling_factors()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -204,15 +204,15 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 		$query->select($db->quoteName('h.name','company_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'h') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('h.id') . ')');
 
-		// Filter by companyjniw global.
-		$companyjniw = $this->companyjniw;
-		if (is_numeric($companyjniw ))
+		// Filter by companykjdf global.
+		$companykjdf = $this->companykjdf;
+		if (is_numeric($companykjdf ))
 		{
-			$query->where('a.company = ' . (int) $companyjniw );
+			$query->where('a.company = ' . (int) $companykjdf );
 		}
-		elseif (is_string($companyjniw))
+		elseif (is_string($companykjdf))
 		{
-			$query->where('a.company = ' . $db->quote($companyjniw));
+			$query->where('a.company = ' . $db->quote($companykjdf));
 		}
 		else
 		{
@@ -255,7 +255,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getKqlinterventions()
+	public function getEqzinterventions()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -290,15 +290,15 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 		$query->select($db->quoteName('g.name','company_name'));
 		$query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'g') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// Filter by companylssr global.
-		$companylssr = $this->companylssr;
-		if (is_numeric($companylssr ))
+		// Filter by companydomr global.
+		$companydomr = $this->companydomr;
+		if (is_numeric($companydomr ))
 		{
-			$query->where('a.company = ' . (int) $companylssr );
+			$query->where('a.company = ' . (int) $companydomr );
 		}
-		elseif (is_string($companylssr))
+		elseif (is_string($companydomr))
 		{
-			$query->where('a.company = ' . $db->quote($companylssr));
+			$query->where('a.company = ' . $db->quote($companydomr));
 		}
 		else
 		{
@@ -351,7 +351,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert type
-					$item->type = $this->selectionTranslationKqlinterventions($item->type, 'type');
+					$item->type = $this->selectionTranslationEqzinterventions($item->type, 'type');
 				}
 			}
 
@@ -365,7 +365,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationKqlinterventions($value,$name)
+	public function selectionTranslationEqzinterventions($value,$name)
 	{
 		// Array of type language strings
 		if ($name == 'type')
diff --git a/site/models/companyresults.php b/site/models/companyresults.php
index 67b94b46..6d36933d 100644
--- a/site/models/companyresults.php
+++ b/site/models/companyresults.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companyresults.php
diff --git a/site/models/cpanel.php b/site/models/cpanel.php
index c9143852..de37229b 100644
--- a/site/models/cpanel.php
+++ b/site/models/cpanel.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		cpanel.php
diff --git a/site/models/createaccount.php b/site/models/createaccount.php
index f6a1aaf2..4e206c80 100644
--- a/site/models/createaccount.php
+++ b/site/models/createaccount.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		createaccount.php
diff --git a/site/models/forms/company.js b/site/models/forms/company.js
index e85e998a..1e16c839 100644
--- a/site/models/forms/company.js
+++ b/site/models/forms/company.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.js
@@ -17,178 +17,178 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_aoEEPbdXel_required = false;
-jform_aoEEPbdgEv_required = false;
-jform_aoEEPbdLdG_required = false;
-jform_aoEEPbdOpw_required = false;
-jform_aoEEPbdtyJ_required = false;
-jform_aoEEPbdtoS_required = false;
-jform_aoEEPbdnDg_required = false;
+jform_imCbNHFptl_required = false;
+jform_imCbNHFifp_required = false;
+jform_imCbNHFdFJ_required = false;
+jform_imCbNHFtBN_required = false;
+jform_imCbNHFXQG_required = false;
+jform_imCbNHFZvf_required = false;
+jform_imCbNHFMrX_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var department_aoEEPbd = jQuery("#jform_department input[type='radio']:checked").val();
-	aoEEPbd(department_aoEEPbd);
+	var department_imCbNHF = jQuery("#jform_department input[type='radio']:checked").val();
+	imCbNHF(department_imCbNHF);
 
-	var department_lHOlbmV = jQuery("#jform_department input[type='radio']:checked").val();
-	lHOlbmV(department_lHOlbmV);
+	var department_HpJMxqK = jQuery("#jform_department input[type='radio']:checked").val();
+	HpJMxqK(department_HpJMxqK);
 });
 
-// the aoEEPbd function
-function aoEEPbd(department_aoEEPbd)
+// the imCbNHF function
+function imCbNHF(department_imCbNHF)
 {
 	// set the function logic
-	if (department_aoEEPbd == 2)
+	if (department_imCbNHF == 2)
 	{
 		jQuery('#jform_causesrisks').closest('.control-group').show();
-		if (jform_aoEEPbdXel_required)
+		if (jform_imCbNHFptl_required)
 		{
 			updateFieldRequired('causesrisks',0);
 			jQuery('#jform_causesrisks').prop('required','required');
 			jQuery('#jform_causesrisks').attr('aria-required',true);
 			jQuery('#jform_causesrisks').addClass('required');
-			jform_aoEEPbdXel_required = false;
+			jform_imCbNHFptl_required = false;
 		}
 
 		jQuery('#jform_percentfemale').closest('.control-group').show();
 		jQuery('#jform_percentmale').closest('.control-group').show();
 		jQuery('#jform_productivity_losses').closest('.control-group').show();
-		if (jform_aoEEPbdgEv_required)
+		if (jform_imCbNHFifp_required)
 		{
 			updateFieldRequired('productivity_losses',0);
 			jQuery('#jform_productivity_losses').prop('required','required');
 			jQuery('#jform_productivity_losses').attr('aria-required',true);
 			jQuery('#jform_productivity_losses').addClass('required');
-			jform_aoEEPbdgEv_required = false;
+			jform_imCbNHFifp_required = false;
 		}
 
 		jQuery('#jform_medical_turnovers_females').closest('.control-group').show();
-		if (jform_aoEEPbdLdG_required)
+		if (jform_imCbNHFdFJ_required)
 		{
 			updateFieldRequired('medical_turnovers_females',0);
 			jQuery('#jform_medical_turnovers_females').prop('required','required');
 			jQuery('#jform_medical_turnovers_females').attr('aria-required',true);
 			jQuery('#jform_medical_turnovers_females').addClass('required');
-			jform_aoEEPbdLdG_required = false;
+			jform_imCbNHFdFJ_required = false;
 		}
 
 		jQuery('#jform_medical_turnovers_males').closest('.control-group').show();
-		if (jform_aoEEPbdOpw_required)
+		if (jform_imCbNHFtBN_required)
 		{
 			updateFieldRequired('medical_turnovers_males',0);
 			jQuery('#jform_medical_turnovers_males').prop('required','required');
 			jQuery('#jform_medical_turnovers_males').attr('aria-required',true);
 			jQuery('#jform_medical_turnovers_males').addClass('required');
-			jform_aoEEPbdOpw_required = false;
+			jform_imCbNHFtBN_required = false;
 		}
 
 		jQuery('#jform_sick_leave_females').closest('.control-group').show();
-		if (jform_aoEEPbdtyJ_required)
+		if (jform_imCbNHFXQG_required)
 		{
 			updateFieldRequired('sick_leave_females',0);
 			jQuery('#jform_sick_leave_females').prop('required','required');
 			jQuery('#jform_sick_leave_females').attr('aria-required',true);
 			jQuery('#jform_sick_leave_females').addClass('required');
-			jform_aoEEPbdtyJ_required = false;
+			jform_imCbNHFXQG_required = false;
 		}
 
 		jQuery('#jform_sick_leave_males').closest('.control-group').show();
-		if (jform_aoEEPbdtoS_required)
+		if (jform_imCbNHFZvf_required)
 		{
 			updateFieldRequired('sick_leave_males',0);
 			jQuery('#jform_sick_leave_males').prop('required','required');
 			jQuery('#jform_sick_leave_males').attr('aria-required',true);
 			jQuery('#jform_sick_leave_males').addClass('required');
-			jform_aoEEPbdtoS_required = false;
+			jform_imCbNHFZvf_required = false;
 		}
 
 		jQuery('#jform_total_healthcare').closest('.control-group').show();
-		if (jform_aoEEPbdnDg_required)
+		if (jform_imCbNHFMrX_required)
 		{
 			updateFieldRequired('total_healthcare',0);
 			jQuery('#jform_total_healthcare').prop('required','required');
 			jQuery('#jform_total_healthcare').attr('aria-required',true);
 			jQuery('#jform_total_healthcare').addClass('required');
-			jform_aoEEPbdnDg_required = false;
+			jform_imCbNHFMrX_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_causesrisks').closest('.control-group').hide();
-		if (!jform_aoEEPbdXel_required)
+		if (!jform_imCbNHFptl_required)
 		{
 			updateFieldRequired('causesrisks',1);
 			jQuery('#jform_causesrisks').removeAttr('required');
 			jQuery('#jform_causesrisks').removeAttr('aria-required');
 			jQuery('#jform_causesrisks').removeClass('required');
-			jform_aoEEPbdXel_required = true;
+			jform_imCbNHFptl_required = true;
 		}
 		jQuery('#jform_percentfemale').closest('.control-group').hide();
 		jQuery('#jform_percentmale').closest('.control-group').hide();
 		jQuery('#jform_productivity_losses').closest('.control-group').hide();
-		if (!jform_aoEEPbdgEv_required)
+		if (!jform_imCbNHFifp_required)
 		{
 			updateFieldRequired('productivity_losses',1);
 			jQuery('#jform_productivity_losses').removeAttr('required');
 			jQuery('#jform_productivity_losses').removeAttr('aria-required');
 			jQuery('#jform_productivity_losses').removeClass('required');
-			jform_aoEEPbdgEv_required = true;
+			jform_imCbNHFifp_required = true;
 		}
 		jQuery('#jform_medical_turnovers_females').closest('.control-group').hide();
-		if (!jform_aoEEPbdLdG_required)
+		if (!jform_imCbNHFdFJ_required)
 		{
 			updateFieldRequired('medical_turnovers_females',1);
 			jQuery('#jform_medical_turnovers_females').removeAttr('required');
 			jQuery('#jform_medical_turnovers_females').removeAttr('aria-required');
 			jQuery('#jform_medical_turnovers_females').removeClass('required');
-			jform_aoEEPbdLdG_required = true;
+			jform_imCbNHFdFJ_required = true;
 		}
 		jQuery('#jform_medical_turnovers_males').closest('.control-group').hide();
-		if (!jform_aoEEPbdOpw_required)
+		if (!jform_imCbNHFtBN_required)
 		{
 			updateFieldRequired('medical_turnovers_males',1);
 			jQuery('#jform_medical_turnovers_males').removeAttr('required');
 			jQuery('#jform_medical_turnovers_males').removeAttr('aria-required');
 			jQuery('#jform_medical_turnovers_males').removeClass('required');
-			jform_aoEEPbdOpw_required = true;
+			jform_imCbNHFtBN_required = true;
 		}
 		jQuery('#jform_sick_leave_females').closest('.control-group').hide();
-		if (!jform_aoEEPbdtyJ_required)
+		if (!jform_imCbNHFXQG_required)
 		{
 			updateFieldRequired('sick_leave_females',1);
 			jQuery('#jform_sick_leave_females').removeAttr('required');
 			jQuery('#jform_sick_leave_females').removeAttr('aria-required');
 			jQuery('#jform_sick_leave_females').removeClass('required');
-			jform_aoEEPbdtyJ_required = true;
+			jform_imCbNHFXQG_required = true;
 		}
 		jQuery('#jform_sick_leave_males').closest('.control-group').hide();
-		if (!jform_aoEEPbdtoS_required)
+		if (!jform_imCbNHFZvf_required)
 		{
 			updateFieldRequired('sick_leave_males',1);
 			jQuery('#jform_sick_leave_males').removeAttr('required');
 			jQuery('#jform_sick_leave_males').removeAttr('aria-required');
 			jQuery('#jform_sick_leave_males').removeClass('required');
-			jform_aoEEPbdtoS_required = true;
+			jform_imCbNHFZvf_required = true;
 		}
 		jQuery('#jform_total_healthcare').closest('.control-group').hide();
-		if (!jform_aoEEPbdnDg_required)
+		if (!jform_imCbNHFMrX_required)
 		{
 			updateFieldRequired('total_healthcare',1);
 			jQuery('#jform_total_healthcare').removeAttr('required');
 			jQuery('#jform_total_healthcare').removeAttr('aria-required');
 			jQuery('#jform_total_healthcare').removeClass('required');
-			jform_aoEEPbdnDg_required = true;
+			jform_imCbNHFMrX_required = true;
 		}
 	}
 }
 
-// the lHOlbmV function
-function lHOlbmV(department_lHOlbmV)
+// the HpJMxqK function
+function HpJMxqK(department_HpJMxqK)
 {
 	// set the function logic
-	if (department_lHOlbmV == 1)
+	if (department_HpJMxqK == 1)
 	{
 		jQuery('.age_groups_note').closest('.control-group').show();
 		jQuery('.cause_risk_selection_note').closest('.control-group').show();
diff --git a/site/models/forms/intervention.js b/site/models/forms/intervention.js
index e02714d8..616946a0 100644
--- a/site/models/forms/intervention.js
+++ b/site/models/forms/intervention.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.js
@@ -17,58 +17,58 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_mHPeTPUmdM_required = false;
-jform_imgMwkfMOF_required = false;
+jform_hjWzglcxQU_required = false;
+jform_QhXOtTUjpY_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var type_mHPeTPU = jQuery("#jform_type input[type='radio']:checked").val();
-	mHPeTPU(type_mHPeTPU);
+	var type_hjWzglc = jQuery("#jform_type input[type='radio']:checked").val();
+	hjWzglc(type_hjWzglc);
 
-	var type_iOljoGp = jQuery("#jform_type input[type='radio']:checked").val();
-	iOljoGp(type_iOljoGp);
+	var type_KIPRxZv = jQuery("#jform_type input[type='radio']:checked").val();
+	KIPRxZv(type_KIPRxZv);
 
-	var company_imgMwkf = jQuery("#jform_company").val();
-	imgMwkf(company_imgMwkf);
+	var company_QhXOtTU = jQuery("#jform_company").val();
+	QhXOtTU(company_QhXOtTU);
 });
 
-// the mHPeTPU function
-function mHPeTPU(type_mHPeTPU)
+// the hjWzglc function
+function hjWzglc(type_hjWzglc)
 {
 	// set the function logic
-	if (type_mHPeTPU == 2)
+	if (type_hjWzglc == 2)
 	{
 		jQuery('#jform_interventions').closest('.control-group').show();
-		if (jform_mHPeTPUmdM_required)
+		if (jform_hjWzglcxQU_required)
 		{
 			updateFieldRequired('interventions',0);
 			jQuery('#jform_interventions').prop('required','required');
 			jQuery('#jform_interventions').attr('aria-required',true);
 			jQuery('#jform_interventions').addClass('required');
-			jform_mHPeTPUmdM_required = false;
+			jform_hjWzglcxQU_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_interventions').closest('.control-group').hide();
-		if (!jform_mHPeTPUmdM_required)
+		if (!jform_hjWzglcxQU_required)
 		{
 			updateFieldRequired('interventions',1);
 			jQuery('#jform_interventions').removeAttr('required');
 			jQuery('#jform_interventions').removeAttr('aria-required');
 			jQuery('#jform_interventions').removeClass('required');
-			jform_mHPeTPUmdM_required = true;
+			jform_hjWzglcxQU_required = true;
 		}
 	}
 }
 
-// the iOljoGp function
-function iOljoGp(type_iOljoGp)
+// the KIPRxZv function
+function KIPRxZv(type_KIPRxZv)
 {
 	// set the function logic
-	if (type_iOljoGp == 1)
+	if (type_KIPRxZv == 1)
 	{
 		jQuery('#jform_intervention').closest('.control-group').show();
 	}
@@ -78,55 +78,55 @@ function iOljoGp(type_iOljoGp)
 	}
 }
 
-// the imgMwkf function
-function imgMwkf(company_imgMwkf)
+// the QhXOtTU function
+function QhXOtTU(company_QhXOtTU)
 {
-	if (isSet(company_imgMwkf) && company_imgMwkf.constructor !== Array)
+	if (isSet(company_QhXOtTU) && company_QhXOtTU.constructor !== Array)
 	{
-		var temp_imgMwkf = company_imgMwkf;
-		var company_imgMwkf = [];
-		company_imgMwkf.push(temp_imgMwkf);
+		var temp_QhXOtTU = company_QhXOtTU;
+		var company_QhXOtTU = [];
+		company_QhXOtTU.push(temp_QhXOtTU);
 	}
-	else if (!isSet(company_imgMwkf))
+	else if (!isSet(company_QhXOtTU))
 	{
-		var company_imgMwkf = [];
+		var company_QhXOtTU = [];
 	}
-	var company = company_imgMwkf.some(company_imgMwkf_SomeFunc);
+	var company = company_QhXOtTU.some(company_QhXOtTU_SomeFunc);
 
 
 	// set this function logic
 	if (company)
 	{
 		jQuery('#jform_country').closest('.control-group').show();
-		if (jform_imgMwkfMOF_required)
+		if (jform_QhXOtTUjpY_required)
 		{
 			updateFieldRequired('country',0);
 			jQuery('#jform_country').prop('required','required');
 			jQuery('#jform_country').attr('aria-required',true);
 			jQuery('#jform_country').addClass('required');
-			jform_imgMwkfMOF_required = false;
+			jform_QhXOtTUjpY_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_country').closest('.control-group').hide();
-		if (!jform_imgMwkfMOF_required)
+		if (!jform_QhXOtTUjpY_required)
 		{
 			updateFieldRequired('country',1);
 			jQuery('#jform_country').removeAttr('required');
 			jQuery('#jform_country').removeAttr('aria-required');
 			jQuery('#jform_country').removeClass('required');
-			jform_imgMwkfMOF_required = true;
+			jform_QhXOtTUjpY_required = true;
 		}
 	}
 }
 
-// the imgMwkf Some function
-function company_imgMwkf_SomeFunc(company_imgMwkf)
+// the QhXOtTU Some function
+function company_QhXOtTU_SomeFunc(company_QhXOtTU)
 {
 	// set the function logic
-	if (company_imgMwkf == 0)
+	if (company_QhXOtTU == 0)
 	{
 		return true;
 	}
diff --git a/site/models/forms/scaling_factor.js b/site/models/forms/scaling_factor.js
index b595ff3f..6d9ee789 100644
--- a/site/models/forms/scaling_factor.js
+++ b/site/models/forms/scaling_factor.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.js
@@ -17,64 +17,64 @@
 /------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_cfzxGECrmV_required = false;
+jform_gXgQwdAHQh_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var company_cfzxGEC = jQuery("#jform_company").val();
-	cfzxGEC(company_cfzxGEC);
+	var company_gXgQwdA = jQuery("#jform_company").val();
+	gXgQwdA(company_gXgQwdA);
 });
 
-// the cfzxGEC function
-function cfzxGEC(company_cfzxGEC)
+// the gXgQwdA function
+function gXgQwdA(company_gXgQwdA)
 {
-	if (isSet(company_cfzxGEC) && company_cfzxGEC.constructor !== Array)
+	if (isSet(company_gXgQwdA) && company_gXgQwdA.constructor !== Array)
 	{
-		var temp_cfzxGEC = company_cfzxGEC;
-		var company_cfzxGEC = [];
-		company_cfzxGEC.push(temp_cfzxGEC);
+		var temp_gXgQwdA = company_gXgQwdA;
+		var company_gXgQwdA = [];
+		company_gXgQwdA.push(temp_gXgQwdA);
 	}
-	else if (!isSet(company_cfzxGEC))
+	else if (!isSet(company_gXgQwdA))
 	{
-		var company_cfzxGEC = [];
+		var company_gXgQwdA = [];
 	}
-	var company = company_cfzxGEC.some(company_cfzxGEC_SomeFunc);
+	var company = company_gXgQwdA.some(company_gXgQwdA_SomeFunc);
 
 
 	// set this function logic
 	if (company)
 	{
 		jQuery('#jform_country').closest('.control-group').show();
-		if (jform_cfzxGECrmV_required)
+		if (jform_gXgQwdAHQh_required)
 		{
 			updateFieldRequired('country',0);
 			jQuery('#jform_country').prop('required','required');
 			jQuery('#jform_country').attr('aria-required',true);
 			jQuery('#jform_country').addClass('required');
-			jform_cfzxGECrmV_required = false;
+			jform_gXgQwdAHQh_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_country').closest('.control-group').hide();
-		if (!jform_cfzxGECrmV_required)
+		if (!jform_gXgQwdAHQh_required)
 		{
 			updateFieldRequired('country',1);
 			jQuery('#jform_country').removeAttr('required');
 			jQuery('#jform_country').removeAttr('aria-required');
 			jQuery('#jform_country').removeClass('required');
-			jform_cfzxGECrmV_required = true;
+			jform_gXgQwdAHQh_required = true;
 		}
 	}
 }
 
-// the cfzxGEC Some function
-function company_cfzxGEC_SomeFunc(company_cfzxGEC)
+// the gXgQwdA Some function
+function company_gXgQwdA_SomeFunc(company_gXgQwdA)
 {
 	// set the function logic
-	if (company_cfzxGEC == 0)
+	if (company_gXgQwdA == 0)
 	{
 		return true;
 	}
diff --git a/site/models/intervention.php b/site/models/intervention.php
index 956323a2..79b44df7 100644
--- a/site/models/intervention.php
+++ b/site/models/intervention.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.php
diff --git a/site/models/publicresults.php b/site/models/publicresults.php
index 06886e7c..47a3b1b4 100644
--- a/site/models/publicresults.php
+++ b/site/models/publicresults.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publicresults.php
diff --git a/site/models/scaling_factor.php b/site/models/scaling_factor.php
index eb8ed2b1..1e2c6604 100644
--- a/site/models/scaling_factor.php
+++ b/site/models/scaling_factor.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.php
diff --git a/site/router.php b/site/router.php
index 13c0ad13..0323f719 100644
--- a/site/router.php
+++ b/site/router.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		router.php
diff --git a/site/views/combinedresults/tmpl/default.php b/site/views/combinedresults/tmpl/default.php
index 84daf0da..5336d4c5 100644
--- a/site/views/combinedresults/tmpl/default.php
+++ b/site/views/combinedresults/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/site/views/combinedresults/tmpl/default_chart_cost.php b/site/views/combinedresults/tmpl/default_chart_cost.php
index 655e4afa..d4e44fc2 100644
--- a/site/views/combinedresults/tmpl/default_chart_cost.php
+++ b/site/views/combinedresults/tmpl/default_chart_cost.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost.php
diff --git a/site/views/combinedresults/tmpl/default_chart_cost_percent.php b/site/views/combinedresults/tmpl/default_chart_cost_percent.php
index 79b64dd0..1779e258 100644
--- a/site/views/combinedresults/tmpl/default_chart_cost_percent.php
+++ b/site/views/combinedresults/tmpl/default_chart_cost_percent.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost_percent.php
diff --git a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
index 3adf951a..002c981f 100644
--- a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
+++ b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_intervention_cost_benefit.php
diff --git a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php
index c143eb76..48cc7269 100644
--- a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php
+++ b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_intervention_cost_benefit_save.php
diff --git a/site/views/combinedresults/tmpl/default_chart_work_days_lost.php b/site/views/combinedresults/tmpl/default_chart_work_days_lost.php
index f9dee386..5775de43 100644
--- a/site/views/combinedresults/tmpl/default_chart_work_days_lost.php
+++ b/site/views/combinedresults/tmpl/default_chart_work_days_lost.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost.php
diff --git a/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php b/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php
index d3221a39..cc1603f7 100644
--- a/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php
+++ b/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost_percent.php
diff --git a/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php b/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php
index 77d8105e..23421943 100644
--- a/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php
+++ b/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_calculated_cost_in_detail.php
diff --git a/site/views/combinedresults/tmpl/default_table_cost_summary.php b/site/views/combinedresults/tmpl/default_table_cost_summary.php
index 5fb203f7..5ddbb8fc 100644
--- a/site/views/combinedresults/tmpl/default_table_cost_summary.php
+++ b/site/views/combinedresults/tmpl/default_table_cost_summary.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_cost_summary.php
diff --git a/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php b/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
index 9bf1f034..3c5e97b4 100644
--- a/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
+++ b/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_intervention_net_benefit.php
diff --git a/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php b/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php
index 0a7c299e..bb9d9dd2 100644
--- a/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php
+++ b/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_work_days_lost_summary.php
@@ -40,6 +40,7 @@ $scaled = array('unscaled','scaled');
 					<th width="11%" data-hide="phone,tablet"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DAYS_LOST_FEMALE_EMPLOYEES'); ?></th>
 					<th width="11%" data-hide="phone"><?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_PER_DISEASERISK_FACTOR'); ?></th>
 					<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_DAYS_LOST'); ?></th>
+					<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_ESTIMATED_BURDEN'); ?></th>
 					<th data-hide="all"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DATA'); ?></th>
 				</tr>        
 			</thead>                                    
@@ -54,6 +55,7 @@ $scaled = array('unscaled','scaled');
 					<td data-value='<?php echo $item->{'female_days_lost_'.$scale}; ?>' ><?php echo round($item->{'female_days_lost_'.$scale},3); ?></td>
 					<td data-value='<?php echo $item->{'subtotal_days_lost_'.$scale}; ?>' ><?php echo round($item->{'subtotal_days_lost_'.$scale},3); ?></td>
 					<td data-value='<?php echo ($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100; ?>' ><?php echo round(($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
+					<td data-value='<?php echo $item->subtotal_estimated_burden; ?>' ><?php echo round($item->subtotal_estimated_burden,3).'%'; ?></td>
 					<td data-value='0' ><?php $item->_tmpType = 'day'; $item->_tmpScale = $scale; echo JLayoutHelper::render('databreakdownmalefemale', $item); ?></td>
 				</tr>
 			<?php endforeach; ?>
@@ -68,6 +70,7 @@ $scaled = array('unscaled','scaled');
 					<td><?php echo round($this->results->totals->{'females_days_lost_'.$scale},3); ?></td>
 					<td><?php echo round($this->results->totals->{'total_days_lost_'.$scale},3); ?></td>
 					<td><?php echo round(($this->results->totals->{'total_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
+					<td><?php echo round($this->results->totals->total_estimated_burden,3).'%'; ?></td>
 					<td>&nbsp;&nbsp;</td>
 				</tr>
 			</tfoot>                                
diff --git a/site/views/combinedresults/view.html.php b/site/views/combinedresults/view.html.php
index 5dff9883..71c5c0ca 100644
--- a/site/views/combinedresults/view.html.php
+++ b/site/views/combinedresults/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/site/views/company/submitbutton.js b/site/views/company/submitbutton.js
index 83d79a71..bedbb8cf 100644
--- a/site/views/company/submitbutton.js
+++ b/site/views/company/submitbutton.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/site/views/company/tmpl/edit.php b/site/views/company/tmpl/edit.php
index fba4b942..0ce998f3 100644
--- a/site/views/company/tmpl/edit.php
+++ b/site/views/company/tmpl/edit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
@@ -143,33 +143,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_department listeners for department_aoEEPbd function
+// #jform_department listeners for department_imCbNHF function
 jQuery('#jform_department').on('keyup',function()
 {
-	var department_aoEEPbd = jQuery("#jform_department input[type='radio']:checked").val();
-	aoEEPbd(department_aoEEPbd);
+	var department_imCbNHF = jQuery("#jform_department input[type='radio']:checked").val();
+	imCbNHF(department_imCbNHF);
 
 });
 jQuery('#adminForm').on('change', '#jform_department',function (e)
 {
 	e.preventDefault();
-	var department_aoEEPbd = jQuery("#jform_department input[type='radio']:checked").val();
-	aoEEPbd(department_aoEEPbd);
+	var department_imCbNHF = jQuery("#jform_department input[type='radio']:checked").val();
+	imCbNHF(department_imCbNHF);
 
 });
 
-// #jform_department listeners for department_lHOlbmV function
+// #jform_department listeners for department_HpJMxqK function
 jQuery('#jform_department').on('keyup',function()
 {
-	var department_lHOlbmV = jQuery("#jform_department input[type='radio']:checked").val();
-	lHOlbmV(department_lHOlbmV);
+	var department_HpJMxqK = jQuery("#jform_department input[type='radio']:checked").val();
+	HpJMxqK(department_HpJMxqK);
 
 });
 jQuery('#adminForm').on('change', '#jform_department',function (e)
 {
 	e.preventDefault();
-	var department_lHOlbmV = jQuery("#jform_department input[type='radio']:checked").val();
-	lHOlbmV(department_lHOlbmV);
+	var department_HpJMxqK = jQuery("#jform_department input[type='radio']:checked").val();
+	HpJMxqK(department_HpJMxqK);
 
 });
 
@@ -208,7 +208,10 @@ jQuery('#adminForm').on('change', '#jform_causesrisks',function (e)
 		}
 	});
 });
-jQuery('input.form-field-repeatable').on('weready', function(e, value){
+
+// add the calculator button
+var cal_button = ' <a class="btn btn-small btn-success" href="https://www.staffhealthcbp.com/download/Productivity_Losses_Calculator_V1.xlsx"> <span class="icon-download icon-white"></span> Calculator </a>';
+jQuery('#jform_productivity_losses').closest('.controls').append(cal_button);jQuery('input.form-field-repeatable').on('weready', function(e, value){
 	if ("jform_percentmale" == e.currentTarget.id)
 	{
 		calPercent('male');
diff --git a/site/views/company/view.html.php b/site/views/company/view.html.php
index 087ff011..47271c85 100644
--- a/site/views/company/view.html.php
+++ b/site/views/company/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
@@ -65,10 +65,10 @@ class CostbenefitprojectionViewCompany extends JViewLegacy
                 }
 
 		// Get Linked view data
-		$this->onzscaling_factors		= $this->get('Onzscaling_factors');
+		$this->rxtscaling_factors		= $this->get('Rxtscaling_factors');
 
 		// Get Linked view data
-		$this->kqlinterventions		= $this->get('Kqlinterventions');
+		$this->eqzinterventions		= $this->get('Eqzinterventions');
 
 		// Set the toolbar
 		$this->addToolBar();
diff --git a/site/views/companyresults/tmpl/default.php b/site/views/companyresults/tmpl/default.php
index 5a9e7a19..68d979e5 100644
--- a/site/views/companyresults/tmpl/default.php
+++ b/site/views/companyresults/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/site/views/companyresults/tmpl/default_chart_cost.php b/site/views/companyresults/tmpl/default_chart_cost.php
index 655e4afa..d4e44fc2 100644
--- a/site/views/companyresults/tmpl/default_chart_cost.php
+++ b/site/views/companyresults/tmpl/default_chart_cost.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost.php
diff --git a/site/views/companyresults/tmpl/default_chart_cost_percent.php b/site/views/companyresults/tmpl/default_chart_cost_percent.php
index 79b64dd0..1779e258 100644
--- a/site/views/companyresults/tmpl/default_chart_cost_percent.php
+++ b/site/views/companyresults/tmpl/default_chart_cost_percent.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost_percent.php
diff --git a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
index 3adf951a..002c981f 100644
--- a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
+++ b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_intervention_cost_benefit.php
diff --git a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php
index c143eb76..48cc7269 100644
--- a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php
+++ b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_intervention_cost_benefit_save.php
diff --git a/site/views/companyresults/tmpl/default_chart_work_days_lost.php b/site/views/companyresults/tmpl/default_chart_work_days_lost.php
index f9dee386..5775de43 100644
--- a/site/views/companyresults/tmpl/default_chart_work_days_lost.php
+++ b/site/views/companyresults/tmpl/default_chart_work_days_lost.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost.php
diff --git a/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php b/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php
index d3221a39..cc1603f7 100644
--- a/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php
+++ b/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_work_days_lost_percent.php
diff --git a/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php b/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php
index 77d8105e..23421943 100644
--- a/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php
+++ b/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_calculated_cost_in_detail.php
diff --git a/site/views/companyresults/tmpl/default_table_cost_summary.php b/site/views/companyresults/tmpl/default_table_cost_summary.php
index 5fb203f7..5ddbb8fc 100644
--- a/site/views/companyresults/tmpl/default_table_cost_summary.php
+++ b/site/views/companyresults/tmpl/default_table_cost_summary.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_cost_summary.php
diff --git a/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php b/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php
index 9bf1f034..3c5e97b4 100644
--- a/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php
+++ b/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_intervention_net_benefit.php
diff --git a/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php b/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php
index 0a7c299e..bb9d9dd2 100644
--- a/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php
+++ b/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_table_work_days_lost_summary.php
@@ -40,6 +40,7 @@ $scaled = array('unscaled','scaled');
 					<th width="11%" data-hide="phone,tablet"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DAYS_LOST_FEMALE_EMPLOYEES'); ?></th>
 					<th width="11%" data-hide="phone"><?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_PER_DISEASERISK_FACTOR'); ?></th>
 					<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_DAYS_LOST'); ?></th>
+					<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_ESTIMATED_BURDEN'); ?></th>
 					<th data-hide="all"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DATA'); ?></th>
 				</tr>        
 			</thead>                                    
@@ -54,6 +55,7 @@ $scaled = array('unscaled','scaled');
 					<td data-value='<?php echo $item->{'female_days_lost_'.$scale}; ?>' ><?php echo round($item->{'female_days_lost_'.$scale},3); ?></td>
 					<td data-value='<?php echo $item->{'subtotal_days_lost_'.$scale}; ?>' ><?php echo round($item->{'subtotal_days_lost_'.$scale},3); ?></td>
 					<td data-value='<?php echo ($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100; ?>' ><?php echo round(($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
+					<td data-value='<?php echo $item->subtotal_estimated_burden; ?>' ><?php echo round($item->subtotal_estimated_burden,3).'%'; ?></td>
 					<td data-value='0' ><?php $item->_tmpType = 'day'; $item->_tmpScale = $scale; echo JLayoutHelper::render('databreakdownmalefemale', $item); ?></td>
 				</tr>
 			<?php endforeach; ?>
@@ -68,6 +70,7 @@ $scaled = array('unscaled','scaled');
 					<td><?php echo round($this->results->totals->{'females_days_lost_'.$scale},3); ?></td>
 					<td><?php echo round($this->results->totals->{'total_days_lost_'.$scale},3); ?></td>
 					<td><?php echo round(($this->results->totals->{'total_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
+					<td><?php echo round($this->results->totals->total_estimated_burden,3).'%'; ?></td>
 					<td>&nbsp;&nbsp;</td>
 				</tr>
 			</tfoot>                                
diff --git a/site/views/companyresults/view.html.php b/site/views/companyresults/view.html.php
index 5d73b6da..12179174 100644
--- a/site/views/companyresults/view.html.php
+++ b/site/views/companyresults/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/site/views/cpanel/tmpl/default.php b/site/views/cpanel/tmpl/default.php
index 56a24e29..1a21426b 100644
--- a/site/views/cpanel/tmpl/default.php
+++ b/site/views/cpanel/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/site/views/cpanel/view.html.php b/site/views/cpanel/view.html.php
index c0f9bf41..49050f6f 100644
--- a/site/views/cpanel/view.html.php
+++ b/site/views/cpanel/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/site/views/createaccount/tmpl/default.php b/site/views/createaccount/tmpl/default.php
index 14a349f7..ea846ef9 100644
--- a/site/views/createaccount/tmpl/default.php
+++ b/site/views/createaccount/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/site/views/createaccount/tmpl/default_cbpmenumodule.php b/site/views/createaccount/tmpl/default_cbpmenumodule.php
index 2cc0df22..6753ba37 100644
--- a/site/views/createaccount/tmpl/default_cbpmenumodule.php
+++ b/site/views/createaccount/tmpl/default_cbpmenumodule.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_cbpmenumodule.php
diff --git a/site/views/createaccount/view.html.php b/site/views/createaccount/view.html.php
index 3ea04cf4..8020eb74 100644
--- a/site/views/createaccount/view.html.php
+++ b/site/views/createaccount/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/site/views/intervention/submitbutton.js b/site/views/intervention/submitbutton.js
index e9328a5e..f2a455f4 100644
--- a/site/views/intervention/submitbutton.js
+++ b/site/views/intervention/submitbutton.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/site/views/intervention/tmpl/edit.php b/site/views/intervention/tmpl/edit.php
index c1106ae1..9ea6b563 100644
--- a/site/views/intervention/tmpl/edit.php
+++ b/site/views/intervention/tmpl/edit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
@@ -105,48 +105,48 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_type listeners for type_mHPeTPU function
+// #jform_type listeners for type_hjWzglc function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_mHPeTPU = jQuery("#jform_type input[type='radio']:checked").val();
-	mHPeTPU(type_mHPeTPU);
+	var type_hjWzglc = jQuery("#jform_type input[type='radio']:checked").val();
+	hjWzglc(type_hjWzglc);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_mHPeTPU = jQuery("#jform_type input[type='radio']:checked").val();
-	mHPeTPU(type_mHPeTPU);
+	var type_hjWzglc = jQuery("#jform_type input[type='radio']:checked").val();
+	hjWzglc(type_hjWzglc);
 
 });
 
-// #jform_type listeners for type_iOljoGp function
+// #jform_type listeners for type_KIPRxZv function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_iOljoGp = jQuery("#jform_type input[type='radio']:checked").val();
-	iOljoGp(type_iOljoGp);
+	var type_KIPRxZv = jQuery("#jform_type input[type='radio']:checked").val();
+	KIPRxZv(type_KIPRxZv);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_iOljoGp = jQuery("#jform_type input[type='radio']:checked").val();
-	iOljoGp(type_iOljoGp);
+	var type_KIPRxZv = jQuery("#jform_type input[type='radio']:checked").val();
+	KIPRxZv(type_KIPRxZv);
 
 });
 
-// #jform_company listeners for company_imgMwkf function
+// #jform_company listeners for company_QhXOtTU function
 jQuery('#jform_company').on('keyup',function()
 {
-	var company_imgMwkf = jQuery("#jform_company").val();
-	imgMwkf(company_imgMwkf);
+	var company_QhXOtTU = jQuery("#jform_company").val();
+	QhXOtTU(company_QhXOtTU);
 
 });
 jQuery('#adminForm').on('change', '#jform_company',function (e)
 {
 	e.preventDefault();
-	var company_imgMwkf = jQuery("#jform_company").val();
-	imgMwkf(company_imgMwkf);
+	var company_QhXOtTU = jQuery("#jform_company").val();
+	QhXOtTU(company_QhXOtTU);
 
 });
 
diff --git a/site/views/intervention/view.html.php b/site/views/intervention/view.html.php
index 39a06d23..23c91ba7 100644
--- a/site/views/intervention/view.html.php
+++ b/site/views/intervention/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/site/views/publicresults/tmpl/default.php b/site/views/publicresults/tmpl/default.php
index 492c7153..c40397f4 100644
--- a/site/views/publicresults/tmpl/default.php
+++ b/site/views/publicresults/tmpl/default.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default.php
diff --git a/site/views/publicresults/tmpl/default_cbpmenumodule.php b/site/views/publicresults/tmpl/default_cbpmenumodule.php
index 2cc0df22..6753ba37 100644
--- a/site/views/publicresults/tmpl/default_cbpmenumodule.php
+++ b/site/views/publicresults/tmpl/default_cbpmenumodule.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_cbpmenumodule.php
diff --git a/site/views/publicresults/tmpl/default_chart_cost_public.php b/site/views/publicresults/tmpl/default_chart_cost_public.php
index bd4de8b7..5950274c 100644
--- a/site/views/publicresults/tmpl/default_chart_cost_public.php
+++ b/site/views/publicresults/tmpl/default_chart_cost_public.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_cost_public.php
diff --git a/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php b/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php
index 66609738..f9307693 100644
--- a/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php
+++ b/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_chart_intervention_cost_benefit_public.php
diff --git a/site/views/publicresults/tmpl/default_contact_form_public.php b/site/views/publicresults/tmpl/default_contact_form_public.php
index 3b2f6d14..d62378c1 100644
--- a/site/views/publicresults/tmpl/default_contact_form_public.php
+++ b/site/views/publicresults/tmpl/default_contact_form_public.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		default_contact_form_public.php
diff --git a/site/views/publicresults/view.html.php b/site/views/publicresults/view.html.php
index ba8b7c98..3ce23b04 100644
--- a/site/views/publicresults/view.html.php
+++ b/site/views/publicresults/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php
diff --git a/site/views/scaling_factor/submitbutton.js b/site/views/scaling_factor/submitbutton.js
index a74c51be..fa967060 100644
--- a/site/views/scaling_factor/submitbutton.js
+++ b/site/views/scaling_factor/submitbutton.js
@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js
diff --git a/site/views/scaling_factor/tmpl/edit.php b/site/views/scaling_factor/tmpl/edit.php
index 462c15a9..1d0719eb 100644
--- a/site/views/scaling_factor/tmpl/edit.php
+++ b/site/views/scaling_factor/tmpl/edit.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		edit.php
@@ -90,18 +90,18 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
 
 <script type="text/javascript">
 
-// #jform_company listeners for company_cfzxGEC function
+// #jform_company listeners for company_gXgQwdA function
 jQuery('#jform_company').on('keyup',function()
 {
-	var company_cfzxGEC = jQuery("#jform_company").val();
-	cfzxGEC(company_cfzxGEC);
+	var company_gXgQwdA = jQuery("#jform_company").val();
+	gXgQwdA(company_gXgQwdA);
 
 });
 jQuery('#adminForm').on('change', '#jform_company',function (e)
 {
 	e.preventDefault();
-	var company_cfzxGEC = jQuery("#jform_company").val();
-	cfzxGEC(company_cfzxGEC);
+	var company_gXgQwdA = jQuery("#jform_company").val();
+	gXgQwdA(company_gXgQwdA);
 
 });
 
diff --git a/site/views/scaling_factor/view.html.php b/site/views/scaling_factor/view.html.php
index 2a1f7e1e..804fa076 100644
--- a/site/views/scaling_factor/view.html.php
+++ b/site/views/scaling_factor/view.html.php
@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.0
-	@build			14th February, 2016
+	@version		3.3.2
+	@build			16th February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php