diff --git a/configuration/ampathforms/CWC_Follow_Up.json b/configuration/ampathforms/CWC_Follow_Up.json
index 162b09c6..7faf0653 100644
--- a/configuration/ampathforms/CWC_Follow_Up.json
+++ b/configuration/ampathforms/CWC_Follow_Up.json
@@ -70,11 +70,11 @@
 								"answers": [
 									{
 										"concept": "160552AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Nutrion services"
+										"label": "Nutrition services"
 									},
 									{
 										"concept": "161624AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Rehabilitaon services"
+										"label": "Rehabilitation services"
 									},
 									{
 										"concept": "5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -148,9 +148,9 @@
 						{
 							"label": "Specify :",
 							"type": "obs",
-							"id": "otherspecifyfollowup",
+							"id": "primaryCaregiverOther",
 							"questionOptions": {
-								"concept": "160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"concept": "167214AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 								"rendering": "text"
 							},
 							"hide": {
@@ -372,14 +372,36 @@
 									{
 										"concept": "80586AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 										"label": "NEVIRAPINE (NVP)"
-									},
+									}
+								]
+							}
+						},
+						{
+							"label": "Is patient reported currently on PCP prophylaxis?",
+							"type": "obs",
+							"id": "currentlyOnPCPProphylaxis",
+							"questionOptions": {
+								"concept": "1109AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "checkbox",
+								"answers": [
 									{
 										"concept": "105281AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "SULFAMETHOXAZOLE / TRIMETHOPRIM (CTX)"
-									},
+										"label": "SULFAMETHOXAZOLE / TRIMETHOPRIM"
+									}
+								]
+							}
+						},
+						{
+							"label": "Current drugs used",
+							"type": "obs",
+							"id": "currentDrugsUsed",
+							"questionOptions": {
+								"concept": "1193AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "checkbox",
+								"answers": [
 									{
 										"concept": "461AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "MULTIVITAMIN (M/vit)"
+										"label": "MULTIVITAMIN"
 									}
 								]
 							}
@@ -649,7 +671,7 @@
 									},
 									{
 										"concept": "115122AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Mulnutrition"
+										"label": "Malnutrition"
 									},
 									{
 										"concept": "5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -673,7 +695,7 @@
 					]
 				},
 				{
-					"label": "Labaratory Information",
+					"label": "Laboratory Information",
 					"isExpanded": "true",
 					"questions": [
 						{
@@ -821,7 +843,7 @@
 			]
 		},
 		{
-			"label": "Early Eye Examination and Deworming",
+			"label": "Early Eye Examination and De-worming",
 			"sections": [
 				{
 					"label": "Eye Care Assessment",
@@ -936,6 +958,15 @@
 										]
 									}
 								},
+								{
+									"label": "Date medication refill due",
+									"type": "obs",
+									"id": "dateMedicationDue",
+									"questionOptions": {
+										"concept": "162549AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"rendering": "date"
+									}
+								},
 								{
 									"label": "AGE",
 									"type": "obs",
@@ -976,22 +1007,6 @@
 											}
 										]
 									}
-								},
-								{
-									"label": "Date Of Next Visit",
-									"type": "obs",
-									"id": "dateOfNextVisit",
-									"questionOptions": {
-										"concept": "5096AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"rendering": "date"
-									},
-									"validators": [
-										{
-											"type": "js_expression",
-											"failsWhenExpression": "(new moment(encDate)).isAfter((new moment(myValue)), 'day') || (new moment(encDate)).isSame((new moment(myValue)), 'day')",
-											"message": "Date of next visit should be greater than the encounter date."
-										}
-									]
 								}
 							],
 							"id": "__r2ovtspGn"
@@ -1104,7 +1119,7 @@
 					"isExpanded": "true",
 					"questions": [
 						{
-							"label": "Physical features: ",
+							"label": "Physical features: e.g Congenital abnormalities etc",
 							"type": "obs",
 							"id": "physicalFeatures",
 							"questionOptions": {