diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
index 6418df5fc..dd3de4dbb
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ npm-debug.log
 .DS_Store
 package-lock.json
 
+/nbproject/private/
\ No newline at end of file
diff --git a/app/images/404.gif b/app/images/404.gif
old mode 100644
new mode 100755
diff --git a/app/images/cluster/dtm-col.jpg b/app/images/cluster/dtm-col.jpg
old mode 100644
new mode 100755
diff --git a/app/images/cluster/groups.jpg b/app/images/cluster/groups.jpg
old mode 100644
new mode 100755
diff --git a/app/images/cluster/groups_01.jpg b/app/images/cluster/groups_01.jpg
old mode 100644
new mode 100755
diff --git a/app/images/cluster/projects-AF17.jpg b/app/images/cluster/projects-AF17.jpg
old mode 100644
new mode 100755
diff --git a/app/images/cluster/projects-CB.jpg b/app/images/cluster/projects-CB.jpg
old mode 100644
new mode 100755
diff --git a/app/images/cluster/projects-CBv1.jpg b/app/images/cluster/projects-CBv1.jpg
old mode 100644
new mode 100755
diff --git a/app/images/cluster/projects-COL.jpg b/app/images/cluster/projects-COL.jpg
old mode 100644
new mode 100755
diff --git a/app/images/docm.png b/app/images/docm.png
old mode 100644
new mode 100755
diff --git a/app/images/docxm.png b/app/images/docxm.png
old mode 100644
new mode 100755
diff --git a/app/images/elsedoc.png b/app/images/elsedoc.png
old mode 100644
new mode 100755
diff --git a/app/images/en.png b/app/images/en.png
old mode 100644
new mode 100755
diff --git a/app/images/immap/pfitzgerald.jpg b/app/images/immap/pfitzgerald.jpg
old mode 100644
new mode 100755
diff --git a/app/images/logo-child_protection.png b/app/images/logo-child_protection.png
new file mode 100755
index 000000000..cb70048f4
Binary files /dev/null and b/app/images/logo-child_protection.png differ
diff --git a/app/images/logo-cp.png b/app/images/logo-cp.png
old mode 100644
new mode 100755
diff --git a/app/images/logo-fss.png b/app/images/logo-fss.png
old mode 100644
new mode 100755
diff --git a/app/images/logo-san.png b/app/images/logo-san.png
old mode 100644
new mode 100755
diff --git a/app/images/logo-smsd.png b/app/images/logo-smsd.png
old mode 100644
new mode 100755
diff --git a/app/images/mp4m.png b/app/images/mp4m.png
old mode 100644
new mode 100755
diff --git a/app/images/pdfm.png b/app/images/pdfm.png
old mode 100644
new mode 100755
diff --git a/app/images/ppt.png b/app/images/ppt.png
old mode 100644
new mode 100755
diff --git a/app/images/snapshots/reporthub/exports/afg_3w.png b/app/images/snapshots/reporthub/exports/afg_3w.png
old mode 100644
new mode 100755
diff --git a/app/images/spain.png b/app/images/spain.png
old mode 100644
new mode 100755
diff --git a/app/images/txtm.png b/app/images/txtm.png
old mode 100644
new mode 100755
diff --git a/app/images/xls.png b/app/images/xls.png
old mode 100644
new mode 100755
diff --git a/app/images/xlsx.png b/app/images/xlsx.png
old mode 100644
new mode 100755
diff --git a/app/images/zipm.png b/app/images/zipm.png
old mode 100644
new mode 100755
diff --git a/app/scripts/app/controllers/admin/controller.authentication.js b/app/scripts/app/controllers/admin/controller.authentication.js
index f7e40c588..6489cc5d1 100755
--- a/app/scripts/app/controllers/admin/controller.authentication.js
+++ b/app/scripts/app/controllers/admin/controller.authentication.js
@@ -127,7 +127,8 @@ angular.module('ngm.widget.form.authentication', ['ngm.provider'])
 						'nutrition': { cluster: 'Nutrition' },
 						'protection': { cluster: 'Protection' },
 						'rnr_chapter': { cluster: 'R&R Chapter' },
-						'wash': { cluster: 'WASH' }
+						'wash': { cluster: 'WASH' },
+						'child_protection':{ cluster: 'Child Protection' }
 					}
 				},
 				
diff --git a/app/scripts/app/directives/materialize.select.js b/app/scripts/app/directives/materialize.select.js
old mode 100644
new mode 100755
diff --git a/app/scripts/app/translate/locale-en.json b/app/scripts/app/translate/locale-en.json
index 5d0892c25..f1957cbd5 100755
--- a/app/scripts/app/translate/locale-en.json
+++ b/app/scripts/app/translate/locale-en.json
@@ -620,6 +620,16 @@
         "male_60_plus":"Male 60+",
         "eld_men":"Eld. Men",
         "total_male":"Total Male",
+        "male_teachers": "Male Teachers",
+        "female_teachers": "Female Teachers",
+        "avg_attendance_boys": "Avg. Attendance Boys ",
+        "avg_attendance_girls": "Avg. Attendance Girls ",
+        "boys_6_12": "Male 6-12",
+        "boys_13_17": "Male 13-17",
+        "youth_male_18_24": "Male 18-24",
+        "girls_6_12": "Female 6-12",
+        "girls_13_17": "Female 13-17",
+        "youth_female_18_24": "Female 18-24",
 
         "girls":"Girls",
         "girls_0_5":"Female 0-5",
@@ -633,6 +643,7 @@
         "population_in_disability":"Population in Disability",
         "total_female":"Total Female",
         "total_beneficiaries":"Total Beneficiaries",
+        "total_financing":"Total Financing",
         "projects_number":"Projects Number",
         "population_beneficiaries":"Population Beneficiaries",
         "number_executing_agencies":"Number of Executing Agencies",
diff --git a/app/scripts/modules/cluster/dashboards/dashboard.4wprojectplan.js b/app/scripts/modules/cluster/dashboards/dashboard.4wprojectplan.js
old mode 100644
new mode 100755
diff --git a/app/scripts/modules/cluster/reports/controllers/cluster.project.report.js b/app/scripts/modules/cluster/reports/controllers/cluster.project.report.js
index f3f85b4e0..cca49a130 100755
--- a/app/scripts/modules/cluster/reports/controllers/cluster.project.report.js
+++ b/app/scripts/modules/cluster/reports/controllers/cluster.project.report.js
@@ -29,7 +29,7 @@ angular.module('ngmReportHub')
 		
 		// empty Project
 		$scope.report = {
-			
+			test: 'Hey yo',
 			// parent
 			ngm: $scope.$parent.ngm,
 
diff --git a/app/scripts/modules/cluster/reports/services/CB/ngmCbBeneficiaries.js b/app/scripts/modules/cluster/reports/services/CB/ngmCbBeneficiaries.js
old mode 100644
new mode 100755
diff --git a/app/scripts/modules/cluster/reports/services/CB/ngmCbLocations.js b/app/scripts/modules/cluster/reports/services/CB/ngmCbLocations.js
old mode 100644
new mode 100755
diff --git a/app/scripts/modules/cluster/reports/services/ngmClusterBeneficiaries.js b/app/scripts/modules/cluster/reports/services/ngmClusterBeneficiaries.js
index da7e1f0fa..3ffc07cf2 100755
--- a/app/scripts/modules/cluster/reports/services/ngmClusterBeneficiaries.js
+++ b/app/scripts/modules/cluster/reports/services/ngmClusterBeneficiaries.js
@@ -11,6 +11,119 @@ angular.module( 'ngmReportHub' )
 
 		// beneficairies
 		var ngmClusterBeneficiaries = {
+			isPresent: function(locationIndex, beneficiaryIndex, key){
+				return ngmClusterBeneficiaries.form[ locationIndex ][ beneficiaryIndex ].hasOwnProperty(key);
+			},
+			isPositive: function(locationIndex, beneficiaryIndex, key){
+				return ngmClusterBeneficiaries.form[ locationIndex ][ beneficiaryIndex ][key];
+			},
+			isPresentandPositive: function(locationIndex, beneficiaryIndex, key){
+				return ngmClusterBeneficiaries.form[ locationIndex ][ beneficiaryIndex ].hasOwnProperty(key) &&ngmClusterBeneficiaries.form[ locationIndex ][ beneficiaryIndex ][key];
+			},
+			// ======================= SADDs skip logics ============================
+			sadd_b_5_11_17_m_em_t: function(locationIndex, beneficiaryIndex){
+				return ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'boys_0_5' ) &&
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'boys_6_11') &&
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'boys_12_17') &&
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'men' ) &&
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'elderly_men' ) &&
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'total_male' );
+			},
+			sadd_g_5_11_17_w_ew_t:function(locationIndex, beneficiaryIndex){
+				return ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'girls_0_5' ) &&
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'girls_6_11' ) &&
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'girls_12_17' ) &&
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'women' ) &&
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'elderly_women' ) &&
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'total_female' );
+			},
+			sadd_bgmw: function(locationIndex, beneficiaryIndex){
+				return ( ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'boys' ) ||
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'girls' ) ||
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'men' ) ||
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'women' ) ) &&
+			( !ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'boys_0_5' )  &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'boys_6_11' ) &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'boys_12_17' ) &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'girls_0_5' )  &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'girls_6_11' ) &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'girls_12_17' ) ) &&
+			( !ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'elderly_men' ) &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'elderly_women' ) )
+			&& (
+				!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'male_teachers') &&
+				!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'female_teachers') && 
+				!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'avg_attendance_boys') &&
+				!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'avg_attendance_girls') ) 
+
+				&& 
+				( !ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'boys_0_5') &&
+				!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'boys_6_12') &&
+				!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'boys_13_17') &&
+				!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'youth_male_18_24') )
+
+				&&
+				
+				( !ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'girls_0_5') &&
+				!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'girls_6_12') &&
+				!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'girls_13_17') &&
+				!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'youth_female_18_24') )
+			},
+			sadd_bgmw_em_ew: function(locationIndex, beneficiaryIndex){
+				return ( ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'boys' ) &&
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'girls' ) &&
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'men' ) &&
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'women' ) &&
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'elderly_men' ) &&
+				ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'elderly_women' ) ) &&
+			( !ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'boys_0_5' )  &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'boys_6_11' ) &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'boys_12_17' ) &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'girls_0_5' )  &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'girls_6_11' ) &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'girls_12_17' ) )
+				&& (
+					!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'male_teachers') &&
+		!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'female_teachers') && 
+		!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'avg_attendance_boys') &&
+		!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'avg_attendance_girls') ) 
+		&& 
+		( !ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'boys_0_5') &&
+		!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'boys_6_12') &&
+		!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'boys_13_17') &&
+		!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'youth_male_18_24') )
+
+		&&
+		
+		( !ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'girls_0_5') &&
+		!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'girls_6_12') &&
+		!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'girls_13_17') &&
+		!ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'youth_female_18_24') );
+},
+			sadd_edu_ng: function(locationIndex, beneficiaryIndex){
+				return ( 
+				ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'male_teachers') &&
+				ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'female_teachers') && ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'avg_attendance_boys') &&
+				ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'avg_attendance_girls') ) &&
+			( !ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'boys_0_5' )  &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'boys_6_11' ) &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'boys_12_17' ) &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'girls_0_5' )  &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'girls_6_11' ) &&
+				!ngmClusterBeneficiaries.isPositive(locationIndex, beneficiaryIndex, 'girls_12_17' ) );
+			},
+			sadd_b_6_12_17_24: function(locationIndex, beneficiaryIndex){
+				return ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'boys_0_5') &&
+				ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'boys_6_12' ) &&
+				ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'boys_13_17') &&
+				ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'youth_male_18_24');
+			},
+			sadd_g_6_12_17_24: function(locationIndex, beneficiaryIndex){
+				return ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'girls_0_5') &&
+				ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'girls_6_12' ) &&
+				ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'girls_13_17') &&
+				ngmClusterBeneficiaries.isPresent(locationIndex, beneficiaryIndex, 'youth_female_18_24');
+			},
 
 			// form
 			form:[[]],
@@ -26,7 +139,8 @@ angular.module( 'ngmReportHub' )
 				'strategic_objective_description',
 				'sector_objective_id',
 				'sector_objective_name',
-				'sector_objective_description'
+				'sector_objective_description',
+				'templatesUrl'
 			],
 
 			defaults: {
@@ -56,7 +170,19 @@ angular.module( 'ngmReportHub' )
 					elderly_women:0,
 					total_male:0,
 					total_female:0,
-					total_beneficiaries:0
+					total_beneficiaries:0,
+
+					male_teachers:0,
+					female_teachers:0,
+					avg_attendance_boys:0,
+					avg_attendance_girls:0,
+
+					boys_6_12:0,
+					boys_13_17:0,
+					youth_male_18_24:0,
+					girls_6_12:0,
+					girls_13_17:0,
+					youth_female_18_24:0
 				},
 				// activity_description: {
 				// 	activity_description_id: '',
@@ -170,6 +296,21 @@ angular.module( 'ngmReportHub' )
 																beneficiary.elderly_women;
 
 					beneficiary.total_beneficiaries += beneficiary.total_male + beneficiary.total_female;
+					//Workaround for Nigeria Education Sector
+					if(beneficiary.hasOwnProperty('male_teachers')){beneficiary.total_beneficiaries +=beneficiary.male_teachers}
+					if(beneficiary.hasOwnProperty('female_teachers')){beneficiary.total_beneficiaries +=beneficiary.female_teachers}
+					if(beneficiary.hasOwnProperty('avg_attendance_boys')){beneficiary.total_beneficiaries +=beneficiary.avg_attendance_boys}
+					if(beneficiary.hasOwnProperty('avg_attendance_girls')){beneficiary.total_beneficiaries +=beneficiary.avg_attendance_girls}
+
+					//Workaround for Nigeria Child Protection Sector
+					if(beneficiary.hasOwnProperty('boys_6_12')){beneficiary.total_beneficiaries +=beneficiary.boys_6_12}
+					if(beneficiary.hasOwnProperty('boys_13_17')){beneficiary.total_beneficiaries +=beneficiary.boys_13_17}
+					if(beneficiary.hasOwnProperty('youth_male_18_24')){beneficiary.total_beneficiaries +=beneficiary.youth_male_18_24}
+					if(beneficiary.hasOwnProperty('girls_6_12')){beneficiary.total_beneficiaries +=beneficiary.girls_6_12}
+					if(beneficiary.hasOwnProperty('girls_13_17')){beneficiary.total_beneficiaries +=beneficiary.girls_13_17}
+					if(beneficiary.hasOwnProperty('youth_female_18_24')){beneficiary.total_beneficiaries +=beneficiary.youth_female_18_24}
+					
+					
 				}, 100 );
 			},
 
@@ -273,7 +414,7 @@ angular.module( 'ngmReportHub' )
 			showFormInputs: function( beneficiary, form ) {
 				var display = false;
 				if ( beneficiary.activity_description_id ) {
-					if( !form.display_activity_detail  ) {
+					if( !beneficiary.hasOwnProperty('display_activity_detail') || !form.display_activity_detail  ) {
 						display = true;
 					}
 					if( beneficiary.activity_detail_id && form.display_activity_detail  ) {
diff --git a/app/scripts/modules/cluster/reports/services/ngmClusterDocument.js b/app/scripts/modules/cluster/reports/services/ngmClusterDocument.js
old mode 100644
new mode 100755
diff --git a/app/scripts/modules/cluster/reports/services/ngmClusterLists.js b/app/scripts/modules/cluster/reports/services/ngmClusterLists.js
index 963e489c8..b84882b93 100755
--- a/app/scripts/modules/cluster/reports/services/ngmClusterLists.js
+++ b/app/scripts/modules/cluster/reports/services/ngmClusterLists.js
@@ -18,7 +18,7 @@ angular.module( 'ngmReportHub' )
 		var ngmClusterLists = {
 
       // comphrensive list of all sectors - ever
-      all_sectors: [ 'cvwg','agriculture','cccm_esnfi','cwcwg','coordination','education','eiewg','emergency_telecommunications','esnfi','fsac','fss','health','logistics','smsd','nutrition','protection','rnr_chapter','wash' ],
+      all_sectors: [ 'cvwg','agriculture','cccm_esnfi','cwcwg','coordination','education','eiewg','emergency_telecommunications','esnfi','fsac','fss','health','logistics','smsd','nutrition','protection','rnr_chapter','wash','child_protection' ],
       all_sectors_minus_smsd: [ 'cvwg','agriculture','cccm_esnfi','cwcwg','coordination','education','eiewg','emergency_telecommunications','esnfi','fsac','fss','health','logistics','nutrition','protection','rnr_chapter','wash' ],
       all_sectors_minus_health: [ 'cvwg','agriculture','cccm_esnfi','cwcwg','coordination','education','eiewg','emergency_telecommunications','esnfi','fsac','fss','logistics','smsd','nutrition','protection','rnr_chapter','wash' ],
       all_sectors_minus_health_smsd: [ 'cvwg','agriculture','cccm_esnfi','cwcwg','coordination','education','eiewg','emergency_telecommunications','esnfi','fsac','fss','logistics','nutrition','protection','rnr_chapter','wash' ],
@@ -27,6 +27,8 @@ angular.module( 'ngmReportHub' )
       all_sectors_minus_wash_health_smsd: [ 'cvwg','agriculture','cccm_esnfi','cwcwg','coordination','education','eiewg','emergency_telecommunications','esnfi','fsac','fss','logistics','nutrition','protection','rnr_chapter' ],
       all_sectors_minus_wash_education: [ 'cvwg','agriculture','cccm_esnfi','cwcwg','coordination','eiewg','emergency_telecommunications','esnfi','fsac','fss','health','logistics','smsd','nutrition','protection','rnr_chapter' ],
       all_sectors_col: ['smsd','education','alojamientos_asentamientos','san','health','recuperacion_temprana','protection','wash','ningún_cluster','coordinación_información'],
+      all_sectors_minus_education: [ 'cvwg','agriculture','cccm_esnfi','cwcwg','coordination','eiewg','emergency_telecommunications','esnfi','fsac','fss','health','logistics','smsd','nutrition','protection','rnr_chapter','wash','child_protection' ],
+
 
        
       // lists ( project, mpc transfers )
@@ -37,7 +39,7 @@ angular.module( 'ngmReportHub' )
           // lists
 					units: ngmClusterLists.getUnits( project.admin0pcode ),
           indicators: ngmClusterLists.getIndicators( true ),
-          delivery_types: ngmClusterLists.getDeliveryTypes( project.admin0pcode ),
+          delivery_types: ngmClusterLists.getDeliveryTypes( project.admin0pcode, project.cluster_id ),
           mpc_purpose: ngmClusterLists.getMpcPurpose(),
 
           // mpc_delivery_type: ngmClusterLists.getMpcDeliveryTypes(project.admin0pcode),
@@ -315,7 +317,7 @@ angular.module( 'ngmReportHub' )
       },
 
       // delivery
-      getDeliveryTypes: function( admin0pcode ) {
+      getDeliveryTypes: function( admin0pcode, cluster_id ) {
 
         var delivery = [];
 
@@ -364,14 +366,26 @@ angular.module( 'ngmReportHub' )
           }];
 
         } else if ( admin0pcode === 'NG' ) {
+          if(cluster_id === 'child_protection'){
+            delivery = [{
+              delivery_type_id: 'disabled',
+              delivery_type_name: 'Disabled'
+            },{
+              delivery_type_id: 'not_disabled',
+              delivery_type_name: 'Not Disabled'
+            }];
+          }else{
+            delivery = [{
+              delivery_type_id: 'completed',
+              delivery_type_name: 'Completed'
+            },{
+              delivery_type_id: 'planned',
+              delivery_type_name: 'Planned'
+            }];
 
-          delivery = [{
-            delivery_type_id: 'completed',
-            delivery_type_name: 'Completed'
-          },{
-            delivery_type_id: 'planned',
-            delivery_type_name: 'Planned'
-          }];
+          }
+
+         
 
         } else {
 
@@ -662,6 +676,9 @@ angular.module( 'ngmReportHub' )
           },{
             cluster_id: 'wash',
             cluster: 'WASH'
+          },{
+            cluster_id: 'child_protection',
+            cluster: 'Child Protection'
           }];
         }
         else if ( admin0pcode.toLowerCase() === 'col' ) {
@@ -3928,56 +3945,116 @@ angular.module( 'ngmReportHub' )
 
         // include for NG
         if ( admin0pcode === 'NG' ) {
-          donors = [
-            { project_donor_id: "africa_development_bank", project_donor_name:"African Development Bank" },
-            { project_donor_id: "australian_high_commission", project_donor_name:"Australian High Commission" },
-            { project_donor_id: "british_high_commission", project_donor_name:"British High Commission" },
-            { project_donor_id: "central_emergency_response_fund", project_donor_name:"Central Emergency Response Fund" },
-            { project_donor_id: "cjk", project_donor_name:"CJK" },
-            { project_donor_id: "danish_international_development_agency", project_donor_name:"Danish International Development Agency" },
-            { project_donor_id: "ukaid", project_donor_name:"Department for International Development (UKAID)" },
-            { project_donor_id: "dgd_belgium_fund", project_donor_name:"DGD Belgium Fund" },
-            { project_donor_id: "disability_rights_fund", project_donor_name:"Disability Rights Fund" },
-            { project_donor_id: "dutch_cooperating_aid_agencies", project_donor_name:"Dutch Cooperating Aid Agencies" },
-            { project_donor_id: "dutch_relief_alliance", project_donor_name:"Dutch Relief Alliance" },
-            { project_donor_id: "embassy_denmark", project_donor_name:"Embassy of Denmark" },
-            { project_donor_id: "embassy_finland", project_donor_name:"Embassy of Finland" },
-            { project_donor_id: "embassy_france", project_donor_name:"Embassy of France" },
-            { project_donor_id: "embassy_israel", project_donor_name:"Embassy of Israel" },
-            { project_donor_id: "embassy_japan", project_donor_name:"Embassy of Japan" },
-            { project_donor_id: "embassy_poland", project_donor_name:"Embassy of Poland" },
-            { project_donor_id: "embassy_sweden", project_donor_name:"Embassy of Sweden" },
-            { project_donor_id: "embassy_switzerland", project_donor_name:"Embassy of Switzerland" },
-            { project_donor_id: "embassy_kingdom_of_netherlands", project_donor_name:"Embassy of the Kingdom of Netherlands" },
-            { project_donor_id: "europe_aid", project_donor_name:"EuropeAid" },
-            { project_donor_id: "european_commission", project_donor_name:"European Commission" },
-            { project_donor_id: "european_commissioner_for_humanitarian_aid_and_civil_protection", project_donor_name:"European Commissioner for Humanitarian Aid and Civil Protection (ECHO)" },
-            { project_donor_id: "european_union", project_donor_name:"European Union" },
-            { project_donor_id: "french_ministry_of_foreign_affairs", project_donor_name:"French Ministry of Foreign Affairs" },
-            { project_donor_id: "german_federal_foreign_office", project_donor_name:"German Federal Foreign Office" },
-            { project_donor_id: "global_affairs_canada", project_donor_name:"Global Affairs Canada" },
-            { project_donor_id: "global_fund", project_donor_name:"Global Fund" },
-            { project_donor_id: "global_fund_for_women", project_donor_name:"Global Fund for Women" },
-            { project_donor_id: "global_fund_observer", project_donor_name:"Global Fund Observer" },
-            { project_donor_id: "high_comission_of_canda", project_donor_name:"High Commission of Canada" },
-            { project_donor_id: "irish_aid", project_donor_name:"Irish Aid" },
-            { project_donor_id: "italian_agency_for_cooperation_and_development", project_donor_name:"Italian Agency for Cooperation and Development" },
-            { project_donor_id: "japan_international_cooperation_agency", project_donor_name:"Japan International Cooperation Agency" },
-            { project_donor_id: "letsai", project_donor_name:"LETSAI" },
-            { project_donor_id: "nigerian_humanitarian_fund", project_donor_name:"Nigerian Humanitarian Fund" },
-            { project_donor_id: "norwegian_ministry_of_foreign_affairs", project_donor_name:"Norwegian Ministry of Foreign Affairs" },
-            { project_donor_id: "office_of_us_disaster_assistance", project_donor_name:"Office of US Disaster Assistance" },
-            { project_donor_id: "plan_international_candaa", project_donor_name:"Plan International Canada" },
-            { project_donor_id: "private_donor", project_donor_name:"Private Donor" },
-            { project_donor_id: "royal_norwegian_embassy", project_donor_name:"Royal Norwegian Embassy" },
-            { project_donor_id: "sv", project_donor_name:"SV" },
-            { project_donor_id: "swedish_international_development_cooperation_agency", project_donor_name:"Swedish International Development Cooperation Agency" },
-            { project_donor_id: "swiss_embassy", project_donor_name:"Swiss Embassy" },
-            { project_donor_id: "swiss_solidarity", project_donor_name:"Swiss Solidarity" },
-            { project_donor_id: "united_nations_childrens_fund", project_donor_name:"United Nations Children's Fund" },
-            { project_donor_id: "usaid", project_donor_name:"United States Agency for International Development" },
-            { project_donor_id: "us_ofda", project_donor_name:"United States Office of Foreign Disaster Assistance" }
+          if( cluster_id === 'education' ){
+            donors = [
+              {project_donor_id: "adb",project_donor_name: "African Development Bank"},
+              {project_donor_id: "austrialian_hc",project_donor_name: "Australian High Commission"},
+              {project_donor_id: "british_hc",project_donor_name: "British High Commission"},
+              {project_donor_id: "cerf",project_donor_name: "Central Emergency Response Fund"},
+              {project_donor_id: "danida",project_donor_name: "Danish International Development Agency"},
+              {project_donor_id: "dfid",project_donor_name: "Department for International Development"},
+              {project_donor_id: "giz",project_donor_name: "Deutsche Gesellschaft für Internationale Zusammenarbeit"},
+              {project_donor_id: "drf",project_donor_name: "Disability Rights Fund"},
+              {project_donor_id: "ecw",project_donor_name: "Education Cannot Wait"},
+              {project_donor_id: "e_belgium",project_donor_name: "Embassy of Belgium"},
+              {project_donor_id: "e_china",project_donor_name: "Embassy of China"},
+              {project_donor_id: "e_denmark",project_donor_name: "Embassy of Denmark"},
+              {project_donor_id: "e_finland",project_donor_name: "Embassy of Finland"},
+              {project_donor_id: "e_france",project_donor_name: "Embassy of France"},
+              {project_donor_id: "e_germany",project_donor_name: "Embassy of Germany"},
+              {project_donor_id: "e_ireland",project_donor_name: "Embassy of Ireland"},
+              {project_donor_id: "e_israel",project_donor_name: "Embassy of Israel"},
+              {project_donor_id: "e_poland",project_donor_name: "Embassy of Poland"},
+              {project_donor_id: "e_sweden",project_donor_name: "Embassy of Sweden"},
+              {project_donor_id: "e_switzerland",project_donor_name: "Embassy of Switzerland"},
+              {project_donor_id: "e_netherlands",project_donor_name: "Embassy of the Kingdom of Netherlands"},
+              {project_donor_id: "echo",project_donor_name: "European Community Humanitarian aid Office"},
+              {project_donor_id: "eu",project_donor_name: "European Union"},
+              {project_donor_id: "fgn",project_donor_name: "Federal Government of Nigeria"},
+              {project_donor_id: "gf",project_donor_name: "Gates Foundation"},
+              {project_donor_id: "gffo",project_donor_name: "Germany Federal Foreign Office"},
+              {project_donor_id: "gac",project_donor_name: "Global Affairs Canada"},
+              {project_donor_id: "gfo",project_donor_name: "Global Fund Observer"},
+              {project_donor_id: "hc_canada",project_donor_name: "High Commission of Canada"},
+              {project_donor_id: "irishaid",project_donor_name: "Irish Aid"},
+              {project_donor_id: "aics",project_donor_name: "Italian Agency for Cooperation and Development"},
+              {project_donor_id: "jica",project_donor_name: "Japan International Cooperation Agency"},
+              {project_donor_id: "e_japan",project_donor_name: "Japaneese Embassy"},
+              {project_donor_id: "kfw",project_donor_name: "Kreditanstalt für Wiederaufbau (KfW)"},
+              {project_donor_id: "luxembourg",project_donor_name: "Luxembourg Government"},
+              {project_donor_id: "mf",project_donor_name: "Malala Fund"},
+              {project_donor_id: "nhf",project_donor_name: "Nigeria Humanitarian Fund"},
+              {project_donor_id: "ng",project_donor_name: "Nigerian Government"},
+              {project_donor_id: "normfa",project_donor_name: "Norwegian Ministry of Foreign Affairs"},
+              {project_donor_id: "norad",project_donor_name: "Norweigian Agency for Development Cooperation"},
+              {project_donor_id: "ofda",project_donor_name: "Office of US Disaster Assistance"},
+              {project_donor_id: "pri",project_donor_name: "Private Individual"},
+              {project_donor_id: "pro",project_donor_name: "Private Organization"},
+              {project_donor_id: "e_norway",project_donor_name: "Royal Norwegian Embassy"},
+              {project_donor_id: "sf",project_donor_name: "Self-Funding"},
+              {project_donor_id: "sida",project_donor_name: "Swedish International Development Agency"},
+              {project_donor_id: "e_swiss",project_donor_name: "Swiss Embassy"},
+              {project_donor_id: "ss",project_donor_name: "Swiss Solidarity"},
+              {project_donor_id: "unicef",project_donor_name: "United Nations Children's Fund"},
+              {project_donor_id: "usaid",project_donor_name: "United States Agency for International Development"},
+              {project_donor_id: "us_embassy",project_donor_name: "United States of America"},
+              {project_donor_id: "vsf",project_donor_name: "Victims Support Fund"},
+              {project_donor_id: "wb",project_donor_name: "World Bank"}
           ];
+          } else {
+            donors = [
+              { project_donor_id: "africa_development_bank", project_donor_name:"African Development Bank" },
+              { project_donor_id: "australian_high_commission", project_donor_name:"Australian High Commission" },
+              { project_donor_id: "british_high_commission", project_donor_name:"British High Commission" },
+              { project_donor_id: "central_emergency_response_fund", project_donor_name:"Central Emergency Response Fund" },
+              { project_donor_id: "cjk", project_donor_name:"CJK" },
+              { project_donor_id: "danish_international_development_agency", project_donor_name:"Danish International Development Agency" },
+              { project_donor_id: "ukaid", project_donor_name:"Department for International Development (UKAID)" },
+              { project_donor_id: "dgd_belgium_fund", project_donor_name:"DGD Belgium Fund" },
+              { project_donor_id: "disability_rights_fund", project_donor_name:"Disability Rights Fund" },
+              { project_donor_id: "dutch_cooperating_aid_agencies", project_donor_name:"Dutch Cooperating Aid Agencies" },
+              { project_donor_id: "dutch_relief_alliance", project_donor_name:"Dutch Relief Alliance" },
+              { project_donor_id: "embassy_denmark", project_donor_name:"Embassy of Denmark" },
+              { project_donor_id: "embassy_finland", project_donor_name:"Embassy of Finland" },
+              { project_donor_id: "embassy_france", project_donor_name:"Embassy of France" },
+              { project_donor_id: "embassy_israel", project_donor_name:"Embassy of Israel" },
+              { project_donor_id: "embassy_japan", project_donor_name:"Embassy of Japan" },
+              { project_donor_id: "embassy_poland", project_donor_name:"Embassy of Poland" },
+              { project_donor_id: "embassy_sweden", project_donor_name:"Embassy of Sweden" },
+              { project_donor_id: "embassy_switzerland", project_donor_name:"Embassy of Switzerland" },
+              { project_donor_id: "embassy_kingdom_of_netherlands", project_donor_name:"Embassy of the Kingdom of Netherlands" },
+              { project_donor_id: "europe_aid", project_donor_name:"EuropeAid" },
+              { project_donor_id: "european_commission", project_donor_name:"European Commission" },
+              { project_donor_id: "european_commissioner_for_humanitarian_aid_and_civil_protection", project_donor_name:"European Commissioner for Humanitarian Aid and Civil Protection (ECHO)" },
+              { project_donor_id: "european_union", project_donor_name:"European Union" },
+              { project_donor_id: "french_ministry_of_foreign_affairs", project_donor_name:"French Ministry of Foreign Affairs" },
+              { project_donor_id: "german_federal_foreign_office", project_donor_name:"German Federal Foreign Office" },
+              { project_donor_id: "global_affairs_canada", project_donor_name:"Global Affairs Canada" },
+              { project_donor_id: "global_fund", project_donor_name:"Global Fund" },
+              { project_donor_id: "global_fund_for_women", project_donor_name:"Global Fund for Women" },
+              { project_donor_id: "global_fund_observer", project_donor_name:"Global Fund Observer" },
+              { project_donor_id: "high_comission_of_canda", project_donor_name:"High Commission of Canada" },
+              { project_donor_id: "irish_aid", project_donor_name:"Irish Aid" },
+              { project_donor_id: "italian_agency_for_cooperation_and_development", project_donor_name:"Italian Agency for Cooperation and Development" },
+              { project_donor_id: "japan_international_cooperation_agency", project_donor_name:"Japan International Cooperation Agency" },
+              { project_donor_id: "letsai", project_donor_name:"LETSAI" },
+              { project_donor_id: "nigerian_humanitarian_fund", project_donor_name:"Nigerian Humanitarian Fund" },
+              { project_donor_id: "norwegian_ministry_of_foreign_affairs", project_donor_name:"Norwegian Ministry of Foreign Affairs" },
+              { project_donor_id: "office_of_us_disaster_assistance", project_donor_name:"Office of US Disaster Assistance" },
+              { project_donor_id: "plan_international_candaa", project_donor_name:"Plan International Canada" },
+              { project_donor_id: "private_donor", project_donor_name:"Private Donor" },
+              { project_donor_id: "royal_norwegian_embassy", project_donor_name:"Royal Norwegian Embassy" },
+              { project_donor_id: "sv", project_donor_name:"SV" },
+              { project_donor_id: "swedish_international_development_cooperation_agency", project_donor_name:"Swedish International Development Cooperation Agency" },
+              { project_donor_id: "swiss_embassy", project_donor_name:"Swiss Embassy" },
+              { project_donor_id: "swiss_solidarity", project_donor_name:"Swiss Solidarity" },
+              { project_donor_id: "united_nations_childrens_fund", project_donor_name:"United Nations Children's Fund" },
+              { project_donor_id: "usaid", project_donor_name:"United States Agency for International Development" },
+              { project_donor_id: "us_ofda", project_donor_name:"United States Office of Foreign Disaster Assistance" }]
+          }
+         
+
+           
         }
 
         // if no list use default
@@ -5308,6 +5385,66 @@ angular.module( 'ngmReportHub' )
           }];
         }
 
+        function excludeSectors(exSectors){
+          var clone =  Object.assign([], ngmClusterLists.all_sectors);
+          exSectors.forEach(function(exSector){
+            var index = clone.indexOf(exSector);
+            if (index > -1) {
+              clone.splice(index, 1);
+            }
+          });
+          return clone;
+        }
+        //admin NG
+        if( admin0pcode === 'NG' ){
+          beneficiaries = [{
+            cluster_id: excludeSectors(['child_protection']),
+            beneficiary_type_id: 'idps',
+            beneficiary_type_name: 'IDPs'
+          },{
+            cluster_id: excludeSectors(['education','child_protection']),
+            beneficiary_type_id: 'drought_idps',
+            beneficiary_type_name: 'Drought IDPs'
+          },{
+            cluster_id: excludeSectors(['education','child_protection']),
+            beneficiary_type_id: 'flood_idps',
+            beneficiary_type_name: 'Flood IDPs'
+          },{
+            cluster_id: excludeSectors(['education','child_protection']),
+            beneficiary_type_id: 'natural_disaster_idps',
+            beneficiary_type_name: 'Natural Disaster IDPs'
+          },{
+            cluster_id: excludeSectors(['education','child_protection']),
+            beneficiary_type_id: 'conflict_idps',
+            beneficiary_type_name: 'Conflict IDPs'
+          },{
+            cluster_id: excludeSectors(['education','child_protection']),
+            beneficiary_type_id: 'refugees',
+            beneficiary_type_name: 'Refugees'
+          },{
+            cluster_id: ngmClusterLists.all_sectors,
+            beneficiary_type_id: 'returnees',
+            beneficiary_type_name: 'Returnees'
+          },{
+            cluster_id: ngmClusterLists.all_sectors,
+            beneficiary_type_id: 'host_communities',
+            beneficiary_type_name: 'Host Communities'
+          },{
+            cluster_id: excludeSectors(['education','child_protection']),
+            beneficiary_type_id: 'stakeholders',
+            beneficiary_type_name: 'Stakeholders'
+          },{
+            cluster_id: excludeSectors(['education','wash']),
+            beneficiary_type_id: 'idps_in_host_communities',
+            beneficiary_type_name: 'IDPs in Host Communities'
+          },{
+            cluster_id: excludeSectors(['education','wash']),
+            beneficiary_type_id: 'idps_in_camps',
+            beneficiary_type_name: 'IDPs in Camps'
+          }
+        ]
+        }
+
         // admin COL
 
         if (  admin0pcode === 'COL' ) {
diff --git a/app/scripts/modules/cluster/views/forms/details/project-upload.html b/app/scripts/modules/cluster/views/forms/details/project-upload.html
old mode 100644
new mode 100755
diff --git a/app/scripts/modules/cluster/views/forms/details/target-beneficiaries/target-beneficiaries.html b/app/scripts/modules/cluster/views/forms/details/target-beneficiaries/target-beneficiaries.html
index 3daf0c216..8a99d6ee6 100755
--- a/app/scripts/modules/cluster/views/forms/details/target-beneficiaries/target-beneficiaries.html
+++ b/app/scripts/modules/cluster/views/forms/details/target-beneficiaries/target-beneficiaries.html
@@ -683,278 +683,350 @@ <h5 class="report-beneficiary-second-title">
 
 
 
-								<!-- SADD ( very SAD age breakdown - male ) -->
-								<div class="row"
-											ng-if="( ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys_0_5' ]  &&
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys_6_11' ] &&
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys_12_17' ] &&
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'men' ] &&
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'elderly_men' ] &&
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'total_male' ] )">
+								<!-- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -->
+									<!-- SADD ( very SAD age breakdown - male ) -->
+									<div class="row"
+									ng-if="ngmClusterBeneficiaries.sadd_b_5_11_17_m_em_t( 0, $index )">
 
 									<!-- boys_0_5 -->
 									<div class="input-field col s12 m2">
-										<input id="ngm-boys_0_5-{{ $index }}"
-														name="ngm-boys_0_5-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.boys_0_5"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys_0_5' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-boys_0_5-{{ $index }}" class="active">{{ 'boys_0_5' | translate }}</label>
+									<input id="ngm-boys_0_5-{{ $index }}"
+													name="ngm-boys_0_5-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.boys_0_5"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-boys_0_5-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'boys_0_5' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-boys_0_5-{{ $index }}" class="active">{{ 'boys_0_5' | translate }}</label>
 									</div>
 									<!-- boys_6_11 -->
 									<div class="input-field col s12 m2">
-										<input id="ngm-boys_6_11-{{ $index }}"
-														name="ngm-boys_6_11-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.boys_6_11"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys_6_11' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-boys_6_11-{{ $index }}" class="active">{{ 'boys_6_11' | translate }}</label>
+									<input id="ngm-boys_6_11-{{ $index }}"
+													name="ngm-boys_6_11-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.boys_6_11"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-boys_6_11-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'boys_6_11' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-boys_6_11-{{ $index }}" class="active">{{ 'boys_6_11' | translate }}</label>
 									</div>
 									<!-- boys_12_17 -->
 									<div class="input-field col s12 m2">
-										<input id="ngm-boys_12_17-{{ $index }}"
-														name="ngm-boys_12_17-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.boys_12_17"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys_12_17' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-boys_12_17-{{ $index }}" class="active">{{ 'boys_12_17' | translate }}</label>
+									<input id="ngm-boys_12_17-{{ $index }}"
+													name="ngm-boys_12_17-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.boys_12_17"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-boys_12_17-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'boys_12_17' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-boys_12_17-{{ $index }}" class="active">{{ 'boys_12_17' | translate }}</label>
 									</div>
 
 									<!-- men -->
 									<div class="input-field col s12 m2">
-										<input id="ngm-men-{{ $index }}"
-														name="ngm-men-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.men"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'men' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-men-{{ $index }}" class="active">{{ 'male_18_59' | translate }}</label>
+									<input id="ngm-men-{{ $index }}"
+													name="ngm-men-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.men"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-men-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'men' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-men-{{ $index }}" class="active">{{ 'male_18_59' | translate }}</label>
 									</div>
 									<!-- elderly_men -->
 									<div class="input-field col s12 m2">
-										<input id="ngm-elderly_men-{{ $index }}"
-														name="ngm-elderly_men-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.elderly_men"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'elderly_men' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-elderly_men-{{ $index }}" class="active">{{ 'male_60_plus' | translate }}</label>
+									<input id="ngm-elderly_men-{{ $index }}"
+													name="ngm-elderly_men-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.elderly_men"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-elderly_men-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'elderly_men' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-elderly_men-{{ $index }}" class="active">{{ 'male_60_plus' | translate }}</label>
 									</div>
 									<!-- total_male -->
 									<div class="input-field col s12 m2">
-										<input id="ngm-total_male-{{ $index }}"
-														name="ngm-total_male-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.total_male"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'total_male' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-total_male-{{ $index }}" class="active">{{ 'total_male' | translate }}</label>
+									<input id="ngm-total_male-{{ $index }}"
+													name="ngm-total_male-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.total_male"
+													ng-change="ngmClusterBeneficiaries.inputChange( 'ngm-total_male-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'total_male' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-total_male-{{ $index }}" class="active">{{ 'total_male' | translate }}</label>
 									</div>
 
-								</div>
+									</div>
 
-								<!-- SADD ( very SAD age breakdown - female ) -->
-								<div class="row"
-											ng-if="( ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls_0_5' ] &&
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls_6_11' ] &&
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls_12_17' ] &&
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'women' ] &&
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'elderly_women' ] &&
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'total_female' ] )">
+									<!-- SADD ( very SAD age breakdown - female ) -->
+									<div class="row"
+										ng-if="ngmClusterBeneficiaries.sadd_g_5_11_17_w_ew_t( 0, $index )">
 
 									<!-- girls_0_5 -->
 									<div class="input-field col s12 m2">
-										<input id="ngm-girls_0_5-{{ $index }}"
-														name="ngm-girls_0_5-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.girls_0_5"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls_0_5' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-girls_0_5-{{ $index }}" class="active">{{ 'girls_0_5' | translate }}</label>
+									<input id="ngm-girls_0_5-{{ $index }}"
+													name="ngm-girls_0_5-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.girls_0_5"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-girls_0_5-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'girls_0_5' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-girls_0_5-{{ $index }}" class="active">{{ 'girls_0_5' | translate }}</label>
 									</div>
 									<!-- girls_6_11 -->
 									<div class="input-field col s12 m2">
-										<input id="ngm-girls_6_11-{{ $index }}"
-														name="ngm-girls_6_11-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.girls_6_11"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls_6_11' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-girls_6_11-{{ $index }}" class="active">{{ 'girls_6_11' | translate }}</label>
+									<input id="ngm-girls_6_11-{{ $index }}"
+													name="ngm-girls_6_11-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.girls_6_11"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-girls_6_11-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'girls_6_11' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-girls_6_11-{{ $index }}" class="active">{{ 'girls_6_11' | translate }}</label>
 									</div>
 									<!-- girls_12_17 -->
 									<div class="input-field col s12 m2">
-										<input id="ngm-girls_12_17-{{ $index }}"
-														name="ngm-girls_12_17-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.girls_12_17"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls_12_17' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-girls_12_17-{{ $index }}" class="active">{{ 'girls_12_17' | translate }}</label>
+									<input id="ngm-girls_12_17-{{ $index }}"
+													name="ngm-girls_12_17-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.girls_12_17"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-girls_12_17-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'girls_12_17' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-girls_12_17-{{ $index }}" class="active">{{ 'girls_12_17' | translate }}</label>
 									</div>
 
 									<!-- women -->
 									<div class="input-field col s12 m2">
-										<input id="ngm-women-{{ $index }}"
-														name="ngm-women-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.women"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'women' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-women-{{ $index }}" class="active">{{ 'female_18_59' | translate }}</label>
+									<input id="ngm-women-{{ $index }}"
+													name="ngm-women-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.women"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-women-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'women' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-women-{{ $index }}" class="active">{{ 'female_18_59' | translate }}</label>
 									</div>
 									<!-- elderly_women -->
 									<div class="input-field col s12 m2">
-										<input id="ngm-elderly_women-{{ $index }}"
-														name="ngm-elderly_women-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.elderly_women"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'elderly_women' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-elderly_women-{{ $index }}" class="active">{{ 'female_60_plus' | translate }}</label>
+									<input id="ngm-elderly_women-{{ $index }}"
+													name="ngm-elderly_women-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.elderly_women"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-elderly_women-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'elderly_women' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-elderly_women-{{ $index }}" class="active">{{ 'female_60_plus' | translate }}</label>
 									</div>
 									<!-- total_female -->
 									<div class="input-field col s12 m2">
-										<input id="ngm-total_female-{{ $index }}"
-														name="ngm-total_female-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.total_female"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'total_female' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-total_female-{{ $index }}" class="active">{{ 'total_female' | translate }}</label>
+									<input id="ngm-total_female-{{ $index }}"
+													name="ngm-total_female-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.total_female"
+													ng-change="ngmClusterBeneficiaries.inputChange( 'ngm-total_female-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'total_female' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-total_female-{{ $index }}" class="active">{{ 'total_female' | translate }}</label>
 									</div>
 
-								</div>
-
-
+									</div>
 
 
-								<!-- SADD ( boys, girls, men, women ) -->
-								<div class="row"
-											ng-if="( ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys' ] ||
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls' ] ||
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'men' ] ||
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'women' ] ) &&
-															( !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys_0_5' ]  &&
-																!ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys_6_11' ] &&
-																!ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys_12_17' ] &&
-																!ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls_0_5' ]  &&
-																!ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls_6_11' ] &&
-																!ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls_12_17' ] ) &&
-															( !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'elderly_men' ] &&
-																!ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'elderly_women' ] )">
+									<!-- SADD (boys, girls, men, women) -->
+									<div class="row"
+										ng-if="ngmClusterBeneficiaries.sadd_bgmw( 0, $index )">
 
 									<!-- boys -->
 									<div class="input-field col s12 m3">
-										<input id="ngm-boys-{{ $index }}"
-														name="ngm-boys-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.boys"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-boys-{{ $index }}" class="active">{{ 'boys' | translate }}</label>
-										<label ng-if="ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-boys-{{ $index }}" class="active">Under 5 Male</label>
+									<input id="ngm-boys-{{ $index }}"
+													name="ngm-boys-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.boys"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-boys-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'boys' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-boys-{{ $index }}" class="active">{{ 'boys' | translate }}</label>
+									<label ng-if="ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-boys-{{ $index }}" class="active">Under 5 Male</label>
 									</div>
 									<!-- girls -->
 									<div class="input-field col s12 m3">
-										<input id="ngm-girls-{{ $index }}"
-														name="ngm-girls-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.girls"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-girls-{{ $index }}" class="active">{{ 'girls' | translate }}</label>
-										<label ng-if="ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-girls-{{ $index }}" class="active">Under 5 Female</label>
+									<input id="ngm-girls-{{ $index }}"
+													name="ngm-girls-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.girls"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-girls-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'girls' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-girls-{{ $index }}" class="active">{{ 'girls' | translate }}</label>
+									<label ng-if="ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-girls-{{ $index }}" class="active">Under 5 Female</label>
 									</div>
 									<!-- men -->
 									<div class="input-field col s12 m3">
-										<input id="ngm-men-{{ $index }}"
-														name="ngm-men-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.men"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'men' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-men-{{ $index }}" class="active">{{ 'men' | translate }}</label>
-										<label ng-if="ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-men-{{ $index }}" class="active">Over 5 Male</label>
+									<input id="ngm-men-{{ $index }}"
+													name="ngm-men-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.men"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-men-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'men' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-men-{{ $index }}" class="active">{{ 'men' | translate }}</label>
+									<label ng-if="ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-men-{{ $index }}" class="active">Over 5 Male</label>
 									</div>
 									<!-- women -->
 									<div class="input-field col s12 m3">
-										<input id="ngm-women-{{ $index }}"
-														name="ngm-women-{{ $index }}"
-														type="number"
-														class="validate"
-														min="0"
-														ng-model="beneficiary.women"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'women' ]"
-														required />
-										<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-women-{{ $index }}" class="active">{{ 'women' | translate }}</label>
-										<label ng-if="ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-women-{{ $index }}" class="active">Over 5 Female</label>
+									<input id="ngm-women-{{ $index }}"
+													name="ngm-women-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.women"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-women-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'women' ]"
+													required />
+									<label ng-if="!ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-women-{{ $index }}" class="active">{{ 'women' | translate }}</label>
+									<label ng-if="ngmClusterBeneficiaries.cxbHealth( project )" for="ngm-women-{{ $index }}" class="active">Over 5 Female</label>
+									</div>
 									</div>
 
-								</div>
 
+									<!-- SADD (boys, girls, men, women, elderly_men, elderly_women) -->
+									<div class="row"
+										ng-if="ngmClusterBeneficiaries.sadd_bgmw_em_ew( 0, $index )">
+
+									<!-- boys -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-boys-{{ $index }}"
+													name="ngm-boys-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.boys"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-boys-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'boys' ]"
+													required />
+									<label for="ngm-boys-{{ $index }}" class="active">{{ 'boys' | translate }}</label>
+									</div>
+									<!-- girls -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-girls-{{ $index }}"
+													name="ngm-girls-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.girls"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-girls-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'girls' ]"
+													required />
+									<label for="ngm-girls-{{ $index }}" class="active">{{ 'girls' | translate }}</label>
+									</div>
+									<!-- men -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-men-{{ $index }}"
+													name="ngm-men-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.men"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-men-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'men' ]"
+													required />
+									<label for="ngm-men-{{ $index }}" class="active">{{ 'men' | translate }}</label>
+									</div>
+									<!-- women -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-women-{{ $index }}"
+													name="ngm-women-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.women"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-women-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'women' ]"
+													required />
+									<label for="ngm-women-{{ $index }}" class="active">{{ 'women' | translate }}</label>
+									</div>
+									<!-- elderly_men -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-elderly_men-{{ $index }}"
+													name="ngm-elderly_men-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.elderly_men"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-elderly_men-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'elderly_men' ]"
+													required />
+									<label for="ngm-elderly_men-{{ $index }}" class="active">{{ 'eld_men' | translate }}</label>
+									</div>
+									<!-- elderly_women -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-elderly_women-{{ $index }}"
+													name="ngm-elderly_women-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.elderly_women"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-elderly_women-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'elderly_women' ]"
+													required />
+									<label for="ngm-elderly_women-{{ $index }}" class="active">{{ 'eld_women' | translate }}</label>
+									</div>
+									</div>
 
-								<!-- SADD ( boys, girls, men, women, elderly ) -->
-								<div class="row"
-											ng-if="( ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys' ] &&
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls' ] &&
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'men' ] &&
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'women' ] &&
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'elderly_men' ] &&
-																ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'elderly_women' ] ) &&
-															( !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys_0_5' ]  &&
-																!ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys_6_11' ] &&
-																!ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys_12_17' ] &&
-																!ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls_0_5' ]  &&
-																!ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls_6_11' ] &&
-																!ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls_12_17' ] )">
+									<!-- SADD (boys, girls, men, women, male_teachers, female_teachers,avg_attendance_boys,avg_attendance_girls) -->
+									<div class="row"
+									ng-if="ngmClusterBeneficiaries.sadd_edu_ng(0, $index )">
 
 									<!-- boys -->
 									<div class="input-field col s12 m2">
@@ -964,8 +1036,9 @@ <h5 class="report-beneficiary-second-title">
 														class="validate"
 														min="0"
 														ng-model="beneficiary.boys"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys' ]"
+														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+															ngmClusterBeneficiaries.inputChange( 'ngm-boys-{{ $index }}' );"
+														ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'boys' ]"
 														required />
 										<label for="ngm-boys-{{ $index }}" class="active">{{ 'boys' | translate }}</label>
 									</div>
@@ -977,8 +1050,9 @@ <h5 class="report-beneficiary-second-title">
 														class="validate"
 														min="0"
 														ng-model="beneficiary.girls"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls' ]"
+														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+															ngmClusterBeneficiaries.inputChange( 'ngm-girls-{{ $index }}' );"
+														ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'girls' ]"
 														required />
 										<label for="ngm-girls-{{ $index }}" class="active">{{ 'girls' | translate }}</label>
 									</div>
@@ -990,8 +1064,9 @@ <h5 class="report-beneficiary-second-title">
 														class="validate"
 														min="0"
 														ng-model="beneficiary.men"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'men' ]"
+														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+															ngmClusterBeneficiaries.inputChange( 'ngm-men-{{ $index }}' );"
+														ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'men' ]"
 														required />
 										<label for="ngm-men-{{ $index }}" class="active">{{ 'men' | translate }}</label>
 									</div>
@@ -1003,39 +1078,258 @@ <h5 class="report-beneficiary-second-title">
 														class="validate"
 														min="0"
 														ng-model="beneficiary.women"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'women' ]"
+														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+															ngmClusterBeneficiaries.inputChange( 'ngm-women-{{ $index }}' );"
+														ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'women' ]"
 														required />
 										<label for="ngm-women-{{ $index }}" class="active">{{ 'women' | translate }}</label>
 									</div>
-									<!-- elderly_men -->
+									<!-- male_teachers -->
 									<div class="input-field col s12 m2">
-										<input id="ngm-elderly_men-{{ $index }}"
-														name="ngm-elderly_men-{{ $index }}"
+										<input id="ngm-male_teachers-{{ $index }}"
+														name="ngm-male_teachers-{{ $index }}"
 														type="number"
 														class="validate"
 														min="0"
-														ng-model="beneficiary.elderly_men"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'elderly_men' ]"
+														ng-model="beneficiary.male_teachers"
+														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+															ngmClusterBeneficiaries.inputChange( 'ngm-male_teachers-{{ $index }}' );"
+														ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'male_teachers' ]"
 														required />
-										<label for="ngm-elderly_men-{{ $index }}" class="active">{{ 'eld_men' | translate }}</label>
+										<label for="ngm-male_teachers-{{ $index }}" class="active">{{ 'male_teachers' | translate }}</label>
 									</div>
-									<!-- elderly_women -->
+									<!-- female_teachers -->
 									<div class="input-field col s12 m2">
-										<input id="ngm-elderly_women-{{ $index }}"
-														name="ngm-elderly_women-{{ $index }}"
+										<input id="ngm-female_teachers-{{ $index }}"
+														name="ngm-female_teachers-{{ $index }}"
 														type="number"
 														class="validate"
 														min="0"
-														ng-model="beneficiary.elderly_women"
-														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );"
-														ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'elderly_women' ]"
+														ng-model="beneficiary.female_teachers"
+														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+															ngmClusterBeneficiaries.inputChange( 'ngm-female_teachers-{{ $index }}' );"
+														ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'female_teachers' ]"
 														required />
-										<label for="ngm-elderly_women-{{ $index }}" class="active">{{ 'eld_women' | translate }}</label>
+										<label for="ngm-female_teachers-{{ $index }}" class="active">{{ 'female_teachers' | translate }}</label>
 									</div>
+									<!-- avg_attendance_boys -->
+									<div class="input-field col s12 m2">
+										<input id="ngm-avg_attendance_boys-{{ $index }}"
+														name="ngm-avg_attendance_boys-{{ $index }}"
+														type="number"
+														class="validate"
+														min="0"
+														ng-model="beneficiary.avg_attendance_boys"
+														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+															ngmClusterBeneficiaries.inputChange( 'ngm-avg_attendance_boys-{{ $index }}' );"
+														ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'avg_attendance_boys' ]"
+														required />
+										<label for="ngm-avg_attendance_boys-{{ $index }}" class="active">{{ 'avg_attendance_boys' | translate }}</label>
+									</div>
+									<!-- avg_attendace_female -->
+									<div class="input-field col s12 m2">
+										<input id="ngm-avg_attendance_girls-{{ $index }}"
+														name="ngm-avg_attendance_girls-{{ $index }}"
+														type="number"
+														class="validate"
+														min="0"
+														ng-model="beneficiary.avg_attendance_girls"
+														ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+															ngmClusterBeneficiaries.inputChange( 'ngm-avg_attendance_girls-{{ $index }}' );"
+														ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'avg_attendance_girls' ]"
+														required />
+										<label for="ngm-avg_attendance_girls-{{ $index }}" class="active">{{ 'avg_attendance_girls' | translate }}</label>
+									</div>
+									</div>
+
+
+									<!-- SADD ( very SAD age breakdown - male ) -->
+									<div class="row"
+									ng-if="ngmClusterBeneficiaries.sadd_b_6_12_17_24(0, $index )">
+
+									<!-- boys_0_5 -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-boys_0_5-{{ $index}}"
+													name="ngm-boys_0_5-{{ $index}}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.boys_0_5"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-boys_0_5-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys_0_5' ]"
+													required />
+									<label for="ngm-boys_0_5-{{ $index }}" class="active">{{ 'boys_0_5' | translate }}</label>
+									</div>
+									<!-- boys_6_12 -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-boys_6_12-{{ $index}}"
+													name="ngm-boys_6_12-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.boys_6_12"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-boys_6_12-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys_6_12' ]"
+													required />
+									<label  for="ngm-boys_6_12-{{ $index }}" class="active">{{ 'boys_6_12' | translate }}</label>
+									</div>
+									<!-- boys_13_17 -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-boys_13_17-{{ $index }}"
+													name="ngm-boys_13_17-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.boys_13_17"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-boys_13_17-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'boys_13_17' ]"
+													required />
+									<label  for="ngm-boys_13_17-{{ $index }}" class="active">{{ 'boys_13_17' | translate }}</label>
+									</div>
+
+									<!-- youth_male_18_24 -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-youth_male_18_24-{{ $index }}"
+													name="ngm-youth_male_18_24-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.youth_male_18_24"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-youth_male_18_24-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'youth_male_18_24' ]"
+													required />
+									<label  for="ngm-youth_male_18_24-{{ $index }}" class="active">{{ 'youth_male_18_24' | translate }}</label>
+									</div>
+
+									<!-- men -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-men-{{ $index }}"
+													name="ngm-men-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.men"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-men-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'men' ]"
+													required />
+									<label  for="ngm-men-{{ $index }}" class="active">{{ 'men' | translate }}</label>
+									</div>
+
+									<!-- total_male -->
+									<!-- <div class="input-field col s12 m2">
+									<input id="ngm-total_male-{{ $index }}"
+													name="ngm-total_male-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.total_male"
+													ng-change="ngmClusterBeneficiaries.inputChange( 'ngm-total_male-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'total_male' ]"
+													required />
+									<label  for="ngm-total_male-{{ $index }}" class="active">{{ 'total_male' | translate }}</label>
+									</div> -->
+
+									</div>
+
+									<!-- SADD ( very SAD age breakdown - female ) -->
+									<div class="row"
+										ng-if="ngmClusterBeneficiaries.sadd_g_6_12_17_24(0, $index)">
+
+									<!-- girls_0_5 -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-girls_0_5-{{ $index }}"
+													name="ngm-girls_0_5-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.girls_0_5"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-girls_0_5-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls_0_5' ]"
+													required />
+									<label  for="ngm-girls_0_5-{{ $index }}" class="active">{{ 'girls_0_5' | translate }}</label>
+									</div>
+									<!-- girls_6_12 -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-girls_6_12-{{ $index }}"
+													name="ngm-girls_6_12-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.girls_6_12"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-girls_6_12-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls_6_12' ]"
+													required />
+									<label  for="ngm-girls_6_12-{{ $index }}" class="active">{{ 'girls_6_12' | translate }}</label>
+									</div>
+									<!-- girls_13_17 -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-girls_13_17-{{ $index }}"
+													name="ngm-girls_13_17-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.girls_13_17"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-girls_13_17-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'girls_13_17' ]"
+													required />
+									<label  for="ngm-girls_13_17-{{ $index }}" class="active">{{ 'girls_13_17' | translate }}</label>
+									</div>
+
+									<!-- youth_female_18_24 -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-youth_female_18_24-{{ $index }}"
+													name="ngm-youth_female_18_24-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.youth_female_18_24"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-youth_female_18_24-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'youth_female_18_24' ]"
+													required />
+									<label  for="ngm-youth_female_18_24-{{ $index }}" class="active">{{ 'youth_female_18_24' | translate }}</label>
+									</div>
+
+									<!-- women -->
+									<div class="input-field col s12 m2">
+									<input id="ngm-women-{{ $index }}"
+													name="ngm-women-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.women"
+													ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+														ngmClusterBeneficiaries.inputChange( 'ngm-women-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ 0 ][ $index ][ 'women' ]"
+													required />
+									<label  for="ngm-women-{{ $index }}" class="active">{{ 'women' | translate }}</label>
+									</div>
+
+									<!-- total_female -->
+									<!-- <div class="input-field col s12 m2">
+									<input id="ngm-total_female-{{ $index }}"
+													name="ngm-total_female-{{ $index }}"
+													type="number"
+													class="validate"
+													min="0"
+													ng-model="beneficiary.total_female"
+													ng-change="ngmClusterBeneficiaries.inputChange( 'ngm-total_female-{{ $index }}' );"
+													ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[0][$index][ 'total_female' ]"
+													required />
+									<label  for="ngm-total_female-{{ $index }}" class="active">{{ 'total_female' | translate }}</label>
+									</div> -->
+
 								</div>
 
+								<!-- |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -->
 
 
 								<!-- TOTAL -->
@@ -1080,12 +1374,15 @@ <h5 class="report-beneficiary-second-title">
 					<div class="row">
 
 						<!-- default -->
-						<button class="btn"
-											ng-if="project.definition.project_status !== 'complete' && project.canEdit"
-											ng-click="project.addBeneficiary();"
+					
+
+						<button ng-if="(project.definition.project_status !== 'complete' && project.canEdit)" class="btn"
+											
+											ng-click="project.addBeneficiary( $locationIndex );"
 											style="margin:20px 10px;">
 							<i class="material-icons left">add</i>{{'add_beneficiaries'|translate}}
 						</button>
+
 					</div>
 
 				</li>
diff --git a/app/scripts/modules/cluster/views/forms/details/target-locations/CB/locations.html b/app/scripts/modules/cluster/views/forms/details/target-locations/CB/locations.html
old mode 100644
new mode 100755
diff --git a/app/scripts/modules/cluster/views/forms/financials/financials-COL.html b/app/scripts/modules/cluster/views/forms/financials/financials-COL.html
old mode 100644
new mode 100755
diff --git a/app/scripts/modules/cluster/views/forms/report/beneficiaries/AF/assessment_fsac.html b/app/scripts/modules/cluster/views/forms/report/beneficiaries/AF/assessment_fsac.html
old mode 100644
new mode 100755
diff --git a/app/scripts/modules/cluster/views/forms/report/beneficiaries/AF/assessment_fsac_absnumber_v2.html b/app/scripts/modules/cluster/views/forms/report/beneficiaries/AF/assessment_fsac_absnumber_v2.html
old mode 100644
new mode 100755
diff --git a/app/scripts/modules/cluster/views/forms/report/beneficiaries/AF/fsac_percentage.html b/app/scripts/modules/cluster/views/forms/report/beneficiaries/AF/fsac_percentage.html
old mode 100644
new mode 100755
diff --git a/app/scripts/modules/cluster/views/forms/report/beneficiaries/beneficiaries.html b/app/scripts/modules/cluster/views/forms/report/beneficiaries/beneficiaries.html
index 565fe128d..e00d2fee4 100755
--- a/app/scripts/modules/cluster/views/forms/report/beneficiaries/beneficiaries.html
+++ b/app/scripts/modules/cluster/views/forms/report/beneficiaries/beneficiaries.html
@@ -1,4 +1,4 @@
-	<style>
+<style>
 	.rotate {
 		transform:rotate(180deg);
 		box-shadow: 0 -2px 5px 0 rgba(0, 0, 0, 0.16), 0 -2px 10px 0 rgba(0, 0, 0, 0.12);
@@ -203,7 +203,7 @@ <h5 class="report-beneficiary-title truncate col s12 m11" ng-if="beneficiary.act
 																		} : true"
 											ng-change="ngmClusterBeneficiaries.updateName( project.lists.activity_details, 'activity_detail_id', 'activity_detail_name', beneficiary );
 																	ngmClusterBeneficiaries.setBeneficiaries( project, 'detail', $locationIndex, $beneficiaryIndex, beneficiary );
-												ngmClusterBeneficiaries.inputChange( 'ngm-activity_detail_id-{{ $locationIndex }}-{{ $beneficiaryIndex }}' ); ngmClusterHelperNgWash.clearAssociations( beneficiary );"
+												ngmClusterBeneficiaries.inputChange( 'ngm-activity_detail_id-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
 											ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !beneficiary.activity_type_id"
 											required>
 							<option value="">{{ 'select' | translate }}</option>
@@ -691,12 +691,7 @@ <h5 class="report-beneficiary-title truncate col s12 m11" ng-if="beneficiary.act
 
 					<!-- SADD ( very SAD age breakdown - male ) -->
 					<div class="row"
-								ng-if="( ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'boys_0_5' ] &&
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'boys_6_11' ] &&
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'boys_12_17' ] &&
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'men' ] &&
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'elderly_men' ] &&
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'total_male' ] )">
+								ng-if="ngmClusterBeneficiaries.sadd_b_5_11_17_m_em_t( $locationIndex, $beneficiaryIndex )">
 
 						<!-- boys_0_5 -->
 						<div class="input-field col s12 m2">
@@ -787,12 +782,7 @@ <h5 class="report-beneficiary-title truncate col s12 m11" ng-if="beneficiary.act
 
 					<!-- SADD ( very SAD age breakdown - female ) -->
 					<div class="row"
-								ng-if="( ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'girls_0_5' ] &&
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'girls_6_11' ] &&
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'girls_12_17' ] &&
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'women' ] &&
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'elderly_women' ] &&
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'total_female' ] )">
+								ng-if="ngmClusterBeneficiaries.sadd_g_5_11_17_w_ew_t( $locationIndex, $beneficiaryIndex )">
 
 						<!-- girls_0_5 -->
 						<div class="input-field col s12 m2">
@@ -884,18 +874,7 @@ <h5 class="report-beneficiary-title truncate col s12 m11" ng-if="beneficiary.act
 
 					<!-- SADD (boys, girls, men, women) -->
 					<div class="row"
-								ng-if="( ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'boys' ] ||
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'girls' ] ||
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'men' ] ||
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'women' ] ) &&
-												( !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'boys_0_5' ]  &&
-													!ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'boys_6_11' ] &&
-													!ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'boys_12_17' ] &&
-													!ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'girls_0_5' ]  &&
-													!ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'girls_6_11' ] &&
-													!ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'girls_12_17' ] ) &&
-												( !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'elderly_men' ] &&
-													!ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'elderly_women' ] )">
+								ng-if="ngmClusterBeneficiaries.sadd_bgmw( $locationIndex, $beneficiaryIndex )">
 
 						<!-- boys -->
 						<div class="input-field col s12 m3">
@@ -962,18 +941,7 @@ <h5 class="report-beneficiary-title truncate col s12 m11" ng-if="beneficiary.act
 
 					<!-- SADD (boys, girls, men, women, elderly_men, elderly_women) -->
 					<div class="row"
-								ng-if="( ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'boys' ] &&
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'girls' ] &&
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'men' ] &&
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'women' ] &&
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'elderly_men' ] &&
-													ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'elderly_women' ] ) &&
-												( !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'boys_0_5' ]  &&
-													!ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'boys_6_11' ] &&
-													!ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'boys_12_17' ] &&
-													!ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'girls_0_5' ]  &&
-													!ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'girls_6_11' ] &&
-													!ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'girls_12_17' ] )">
+								ng-if="ngmClusterBeneficiaries.sadd_bgmw_em_ew( $locationIndex, $beneficiaryIndex )">
 
 						<!-- boys -->
 						<div class="input-field col s12 m2">
@@ -1061,7 +1029,310 @@ <h5 class="report-beneficiary-title truncate col s12 m11" ng-if="beneficiary.act
 						</div>
 					</div>
 
+					<!-- SADD (boys, girls, men, women, male_teachers, female_teachers,avg_attendance_boys,avg_attendance_girls) -->
+						<div class="row"
+						ng-if="ngmClusterBeneficiaries.sadd_edu_ng($locationIndex, $beneficiaryIndex )">
 
+							<!-- boys -->
+							<div class="input-field col s12 m2">
+								<input id="ngm-boys-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												name="ngm-boys-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												type="number"
+												class="validate"
+												min="0"
+												ng-model="beneficiary.boys"
+												ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+													ngmClusterBeneficiaries.inputChange( 'ngm-boys-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+												ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'boys' ]"
+												required />
+								<label for="ngm-boys-{{ $locationIndex }}-{{ $beneficiaryIndex }}" class="active">{{ 'boys' | translate }}</label>
+							</div>
+							<!-- girls -->
+							<div class="input-field col s12 m2">
+								<input id="ngm-girls-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												name="ngm-girls-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												type="number"
+												class="validate"
+												min="0"
+												ng-model="beneficiary.girls"
+												ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+													ngmClusterBeneficiaries.inputChange( 'ngm-girls-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+												ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'girls' ]"
+												required />
+								<label for="ngm-girls-{{ $locationIndex }}-{{ $beneficiaryIndex }}" class="active">{{ 'girls' | translate }}</label>
+							</div>
+							<!-- men -->
+							<div class="input-field col s12 m2">
+								<input id="ngm-men-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												name="ngm-men-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												type="number"
+												class="validate"
+												min="0"
+												ng-model="beneficiary.men"
+												ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+													ngmClusterBeneficiaries.inputChange( 'ngm-men-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+												ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'men' ]"
+												required />
+								<label for="ngm-men-{{ $locationIndex }}-{{ $beneficiaryIndex }}" class="active">{{ 'men' | translate }}</label>
+							</div>
+							<!-- women -->
+							<div class="input-field col s12 m2">
+								<input id="ngm-women-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												name="ngm-women-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												type="number"
+												class="validate"
+												min="0"
+												ng-model="beneficiary.women"
+												ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+													ngmClusterBeneficiaries.inputChange( 'ngm-women-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+												ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'women' ]"
+												required />
+								<label for="ngm-women-{{ $locationIndex }}-{{ $beneficiaryIndex }}" class="active">{{ 'women' | translate }}</label>
+							</div>
+							<!-- male_teachers -->
+							<div class="input-field col s12 m2">
+								<input id="ngm-male_teachers-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												name="ngm-male_teachers-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												type="number"
+												class="validate"
+												min="0"
+												ng-model="beneficiary.male_teachers"
+												ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+													ngmClusterBeneficiaries.inputChange( 'ngm-male_teachers-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+												ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'male_teachers' ]"
+												required />
+								<label for="ngm-male_teachers-{{ $locationIndex }}-{{ $beneficiaryIndex }}" class="active">{{ 'male_teachers' | translate }}</label>
+							</div>
+							<!-- female_teachers -->
+							<div class="input-field col s12 m2">
+								<input id="ngm-female_teachers-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												name="ngm-female_teachers-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												type="number"
+												class="validate"
+												min="0"
+												ng-model="beneficiary.female_teachers"
+												ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+													ngmClusterBeneficiaries.inputChange( 'ngm-female_teachers-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+												ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'female_teachers' ]"
+												required />
+								<label for="ngm-female_teachers-{{ $locationIndex }}-{{ $beneficiaryIndex }}" class="active">{{ 'female_teachers' | translate }}</label>
+							</div>
+							<!-- avg_attendance_boys -->
+							<div class="input-field col s12 m2">
+								<input id="ngm-avg_attendance_boys-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												name="ngm-avg_attendance_boys-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												type="number"
+												class="validate"
+												min="0"
+												ng-model="beneficiary.avg_attendance_boys"
+												ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+													ngmClusterBeneficiaries.inputChange( 'ngm-avg_attendance_boys-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+												ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'avg_attendance_boys' ]"
+												required />
+								<label for="ngm-avg_attendance_boys-{{ $locationIndex }}-{{ $beneficiaryIndex }}" class="active">{{ 'avg_attendance_boys' | translate }}</label>
+							</div>
+							<!-- avg_attendace_female -->
+							<div class="input-field col s12 m2">
+								<input id="ngm-avg_attendance_girls-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												name="ngm-avg_attendance_girls-{{ $locationIndex }}-{{ $beneficiaryIndex }}"
+												type="number"
+												class="validate"
+												min="0"
+												ng-model="beneficiary.avg_attendance_girls"
+												ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+													ngmClusterBeneficiaries.inputChange( 'ngm-avg_attendance_girls-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+												ng-disabled="project.definition.project_status === 'complete' || project.report.report_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'avg_attendance_girls' ]"
+												required />
+								<label for="ngm-avg_attendance_girls-{{ $locationIndex }}-{{ $beneficiaryIndex }}" class="active">{{ 'avg_attendance_girls' | translate }}</label>
+							</div>
+						</div>
+
+					
+						<!-- SADD ( very SAD age breakdown - male ) -->
+					<div class="row"
+					ng-if="ngmClusterBeneficiaries.sadd_b_6_12_17_24($locationIndex, $beneficiaryIndex )">
+
+						<!-- boys_0_5 -->
+						<div class="input-field col s12 m2">
+							<input id="ngm-boys_0_5-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											name="ngm-boys_0_5-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											type="number"
+											class="validate"
+											min="0"
+											ng-model="beneficiary.boys_0_5"
+											ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+												ngmClusterBeneficiaries.inputChange( 'ngm-boys_0_5-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+											ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'boys_0_5' ]"
+											required />
+							<label for="ngm-boys_0_5-{{ $locationIndex }}-{{$beneficiaryIndex}}" class="active">{{ 'boys_0_5' | translate }}</label>
+						</div>
+						<!-- boys_6_12 -->
+						<div class="input-field col s12 m2">
+							<input id="ngm-boys_6_12-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											name="ngm-boys_6_12-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											type="number"
+											class="validate"
+											min="0"
+											ng-model="beneficiary.boys_6_12"
+											ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+												ngmClusterBeneficiaries.inputChange( 'ngm-boys_6_12-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+											ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'boys_6_12' ]"
+											required />
+							<label  for="ngm-boys_6_12-{{ $locationIndex }}-{{$beneficiaryIndex}}" class="active">{{ 'boys_6_12' | translate }}</label>
+						</div>
+						<!-- boys_13_17 -->
+						<div class="input-field col s12 m2">
+							<input id="ngm-boys_13_17-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											name="ngm-boys_13_17-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											type="number"
+											class="validate"
+											min="0"
+											ng-model="beneficiary.boys_13_17"
+											ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+												ngmClusterBeneficiaries.inputChange( 'ngm-boys_13_17-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+											ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'boys_13_17' ]"
+											required />
+							<label  for="ngm-boys_13_17-{{ $locationIndex }}-{{$beneficiaryIndex}}" class="active">{{ 'boys_13_17' | translate }}</label>
+						</div>
+
+						<!-- youth_male_18_24 -->
+						<div class="input-field col s12 m2">
+							<input id="ngm-youth_male_18_24-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											name="ngm-youth_male_18_24-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											type="number"
+											class="validate"
+											min="0"
+											ng-model="beneficiary.youth_male_18_24"
+											ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+												ngmClusterBeneficiaries.inputChange( 'ngm-youth_male_18_24-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+											ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'youth_male_18_24' ]"
+											required />
+							<label  for="ngm-youth_male_18_24-{{ $locationIndex }}-{{$beneficiaryIndex}}" class="active">{{ 'youth_male_18_24' | translate }}</label>
+						</div>
+
+						<!-- men -->
+						<div class="input-field col s12 m2">
+							<input id="ngm-men-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											name="ngm-men-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											type="number"
+											class="validate"
+											min="0"
+											ng-model="beneficiary.men"
+											ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+												ngmClusterBeneficiaries.inputChange( 'ngm-men-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+											ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'men' ]"
+											required />
+							<label  for="ngm-men-{{ $locationIndex }}-{{$beneficiaryIndex}}" class="active">{{ 'men' | translate }}</label>
+						</div>
+					
+						<!-- total_male -->
+						<!-- <div class="input-field col s12 m2">
+							<input id="ngm-total_male-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											name="ngm-total_male-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											type="number"
+											class="validate"
+											min="0"
+											ng-model="beneficiary.total_male"
+											ng-change="ngmClusterBeneficiaries.inputChange( 'ngm-total_male-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+											ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'total_male' ]"
+											required />
+							<label  for="ngm-total_male-{{ $locationIndex }}-{{$beneficiaryIndex}}" class="active">{{ 'total_male' | translate }}</label>
+						</div> -->
+
+					</div>
+
+					<!-- SADD ( very SAD age breakdown - female ) -->
+					<div class="row"
+								ng-if="ngmClusterBeneficiaries.sadd_g_6_12_17_24($locationIndex, $beneficiaryIndex)">
+
+						<!-- girls_0_5 -->
+						<div class="input-field col s12 m2">
+							<input id="ngm-girls_0_5-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											name="ngm-girls_0_5-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											type="number"
+											class="validate"
+											min="0"
+											ng-model="beneficiary.girls_0_5"
+											ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+												ngmClusterBeneficiaries.inputChange( 'ngm-girls_0_5-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+											ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'girls_0_5' ]"
+											required />
+							<label  for="ngm-girls_0_5-{{ $locationIndex }}-{{$beneficiaryIndex}}" class="active">{{ 'girls_0_5' | translate }}</label>
+						</div>
+						<!-- girls_6_12 -->
+						<div class="input-field col s12 m2">
+							<input id="ngm-girls_6_12-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											name="ngm-girls_6_12-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											type="number"
+											class="validate"
+											min="0"
+											ng-model="beneficiary.girls_6_12"
+											ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+												ngmClusterBeneficiaries.inputChange( 'ngm-girls_6_12-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+											ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'girls_6_12' ]"
+											required />
+							<label  for="ngm-girls_6_12-{{ $locationIndex }}-{{$beneficiaryIndex}}" class="active">{{ 'girls_6_12' | translate }}</label>
+						</div>
+						<!-- girls_13_17 -->
+						<div class="input-field col s12 m2">
+							<input id="ngm-girls_13_17-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											name="ngm-girls_13_17-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											type="number"
+											class="validate"
+											min="0"
+											ng-model="beneficiary.girls_13_17"
+											ng-change="ngmClusterBeneficiaries.updateBeneficiairesBreakdown( beneficiary );
+												ngmClusterBeneficiaries.inputChange( 'ngm-girls_13_17-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+											ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'girls_13_17' ]"
+											required />
+							<label  for="ngm-girls_13_17-{{ $locationIndex }}-{{$beneficiaryIndex}}" class="active">{{ 'girls_13_17' | translate }}</label>
+						</div>
+
+						<!-- youth_female_18_24 -->
+						<div class="input-field col s12 m2">
+							<input id="ngm-youth_female_18_24-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											name="ngm-youth_female_18_24-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											type="number"
+											class="validate"
+											min="0"
+											ng-model="beneficiary.youth_female_18_24"
+											ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+												ngmClusterBeneficiaries.inputChange( 'ngm-youth_female_18_24-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+											ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'youth_female_18_24' ]"
+											required />
+							<label  for="ngm-youth_female_18_24-{{ $locationIndex }}-{{$beneficiaryIndex}}" class="active">{{ 'youth_female_18_24' | translate }}</label>
+						</div>
+
+						<!-- women -->
+						<div class="input-field col s12 m2">
+							<input id="ngm-women-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											name="ngm-women-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											type="number"
+											class="validate"
+											min="0"
+											ng-model="beneficiary.women"
+											ng-change="ngmClusterBeneficiaries.updateBeneficiaires( beneficiary );
+												ngmClusterBeneficiaries.inputChange( 'ngm-women-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+											ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'women' ]"
+											required />
+							<label  for="ngm-women-{{ $locationIndex }}-{{$beneficiaryIndex}}" class="active">{{ 'women' | translate }}</label>
+						</div>
+						
+						<!-- total_female -->
+						<!-- <div class="input-field col s12 m2">
+							<input id="ngm-total_female-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											name="ngm-total_female-{{ $locationIndex }}-{{$beneficiaryIndex}}"
+											type="number"
+											class="validate"
+											min="0"
+											ng-model="beneficiary.total_female"
+											ng-change="ngmClusterBeneficiaries.inputChange( 'ngm-total_female-{{ $locationIndex }}-{{ $beneficiaryIndex }}' );"
+											ng-disabled="project.definition.project_status === 'complete' || !ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'total_female' ]"
+											required />
+							<label  for="ngm-total_female-{{ $locationIndex }}-{{$beneficiaryIndex}}" class="active">{{ 'total_female' | translate }}</label>
+						</div> -->
+
+					</div>
 
 					<!-- TOTAL -->
 					<div class="row" ng-if="ngmClusterBeneficiaries.form[ $locationIndex ][ $beneficiaryIndex ][ 'total_beneficiaries' ]">
diff --git a/app/scripts/widgets/ngm-html/template/COL/projectdonor.html b/app/scripts/widgets/ngm-html/template/COL/projectdonor.html
old mode 100644
new mode 100755
diff --git a/app/scripts/widgets/ngm-html/template/COL/responsecomponents.html b/app/scripts/widgets/ngm-html/template/COL/responsecomponents.html
old mode 100644
new mode 100755
diff --git a/app/scripts/widgets/ngm-list/template/hide_list.html b/app/scripts/widgets/ngm-list/template/hide_list.html
old mode 100644
new mode 100755
diff --git a/app/scripts/widgets/ngm-list/template/report_somalia.html b/app/scripts/widgets/ngm-list/template/report_somalia.html
old mode 100644
new mode 100755
diff --git a/app/tableau/LICENSE b/app/tableau/LICENSE
old mode 100644
new mode 100755
diff --git a/app/tableau/css/materialize.css b/app/tableau/css/materialize.css
old mode 100644
new mode 100755
diff --git a/app/tableau/css/materialize.min.css b/app/tableau/css/materialize.min.css
old mode 100644
new mode 100755
diff --git a/app/tableau/css/style.css b/app/tableau/css/style.css
old mode 100644
new mode 100755
diff --git a/app/tableau/images/favicon-32x32.png b/app/tableau/images/favicon-32x32.png
old mode 100644
new mode 100755
diff --git a/app/tableau/images/logo-glc.svg b/app/tableau/images/logo-glc.svg
old mode 100644
new mode 100755
diff --git a/app/tableau/images/logo-tableau.png b/app/tableau/images/logo-tableau.png
old mode 100644
new mode 100755
diff --git a/app/tableau/index.html b/app/tableau/index.html
old mode 100644
new mode 100755
diff --git a/app/tableau/js/init.js b/app/tableau/js/init.js
old mode 100644
new mode 100755
diff --git a/app/tableau/js/materialize.js b/app/tableau/js/materialize.js
old mode 100644
new mode 100755
diff --git a/app/tableau/js/materialize.min.js b/app/tableau/js/materialize.min.js
old mode 100644
new mode 100755
diff --git a/app/tableau/js/tableauwdc-2.3.latest.js b/app/tableau/js/tableauwdc-2.3.latest.js
old mode 100644
new mode 100755
diff --git a/app/tableau/modules/glc/cxb/315279.html b/app/tableau/modules/glc/cxb/315279.html
old mode 100644
new mode 100755
diff --git a/app/tableau/modules/glc/cxb/earthquakes.html b/app/tableau/modules/glc/cxb/earthquakes.html
old mode 100644
new mode 100755
diff --git a/app/tableau/modules/glc/cxb/js/315279.js b/app/tableau/modules/glc/cxb/js/315279.js
old mode 100644
new mode 100755
diff --git a/app/tableau/modules/glc/cxb/js/earthquakes.js b/app/tableau/modules/glc/cxb/js/earthquakes.js
old mode 100644
new mode 100755
diff --git a/app/tableau/modules/glc/cxb/js/init.js b/app/tableau/modules/glc/cxb/js/init.js
old mode 100644
new mode 100755