diff --git a/configuration/ampathforms/Alcohol_and_Drug_Abuse_Screening(CAGE-AID_CRAFFT).json b/configuration/ampathforms/Alcohol_and_Drug_Abuse_Screening(CAGE-AID_CRAFFT).json
index 26fd70f8..8bada9c8 100644
--- a/configuration/ampathforms/Alcohol_and_Drug_Abuse_Screening(CAGE-AID_CRAFFT).json
+++ b/configuration/ampathforms/Alcohol_and_Drug_Abuse_Screening(CAGE-AID_CRAFFT).json
@@ -45,101 +45,111 @@
 							"id": "encLocation"
 						},
 						{
-							"label": "How often do you have a drink containing alcohol?",
-							"type": "obs",
-							"id": "alcoholDrink",
+							"label": "CAGE-AID SCREENING FOR ALCOHOL AND DRUG USE DISORDERS FOR ADULTS",
+							"type": "obsGroup",
 							"questionOptions": {
-								"concept": "159449AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "select",
-								"answers": [
-									{
-										"concept": "1090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Never"
-									},
-									{
-										"concept": "1091AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Monthly or less"
-									},
-									{
-										"concept": "1092AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "2 to 4 times a month"
-									},
-									{
-										"concept": "1093AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "2 to 3 times a week"
-									},
-									{
-										"concept": "1094AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "4 or More Times a Week"
+								"concept": "158728AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "group"
+							},
+							"questions": [
+								{
+									"label": "How often do you have a drink containing alcohol?",
+									"type": "obs",
+									"id": "alcoholDrink",
+									"questionOptions": {
+										"concept": "159449AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"rendering": "select",
+										"answers": [
+											{
+												"concept": "1090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Never"
+											},
+											{
+												"concept": "1091AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Monthly or less"
+											},
+											{
+												"concept": "1092AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "2 to 4 times a month"
+											},
+											{
+												"concept": "1093AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "2 to 3 times a week"
+											},
+											{
+												"concept": "1094AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "4 or More Times a Week"
+											}
+										]
 									}
-								]
-							}
-						},
-						{
-							"label": "How often do you smoke?",
-							"type": "obs",
-							"id": "smoke",
-							"questionOptions": {
-								"concept": "159449AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "select",
-								"answers": [
-									{
-										"concept": "1090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Never Smoked"
-									},
-									{
-										"concept": "156358AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Former cigarette smoker"
-									},
-									{
-										"concept": "163197AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Current some day smoker"
-									},
-									{
-										"concept": "163196AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Current light tobacco smoker"
-									},
-									{
-										"concept": "163195AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Current heavy tobacco smoker"
-									},
-									{
-										"concept": "163200AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Unknown if ever smoked"
+								},
+								{
+									"label": "How often do you smoke?",
+									"type": "obs",
+									"id": "smoke",
+									"questionOptions": {
+										"concept": "163201AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"rendering": "select",
+										"answers": [
+											{
+												"concept": "1090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Never Smoked"
+											},
+											{
+												"concept": "156358AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Former cigarette smoker"
+											},
+											{
+												"concept": "163197AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Current some day smoker"
+											},
+											{
+												"concept": "163196AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Current light tobacco smoker"
+											},
+											{
+												"concept": "163195AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Current heavy tobacco smoker"
+											},
+											{
+												"concept": "163200AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Unknown if ever smoked"
+											}
+										]
 									}
-								]
-							}
-						},
-						{
-							"label": "How often do you use drugs?",
-							"type": "obs",
-							"id": "drugs",
-							"questionOptions": {
-								"concept": "112603AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "select",
-								"answers": [
-									{
-										"concept": "1090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Never"
-									},
-									{
-										"concept": "1091AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Monthly or less"
-									},
-									{
-										"concept": "1092AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "2 to 4 times a month"
-									},
-									{
-										"concept": "1093AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "2 to 3 times a week"
-									},
-									{
-										"concept": "1094AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "4 or More Times a Week"
+								},
+								{
+									"label": "How often do you use drugs?",
+									"type": "obs",
+									"id": "drugs",
+									"questionOptions": {
+										"concept": "112603AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"rendering": "select",
+										"answers": [
+											{
+												"concept": "1090AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Never"
+											},
+											{
+												"concept": "1091AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Monthly or less"
+											},
+											{
+												"concept": "1092AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "2 to 4 times a month"
+											},
+											{
+												"concept": "1093AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "2 to 3 times a week"
+											},
+											{
+												"concept": "1094AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "4 or More Times a Week"
+											}
+										]
 									}
-								]
-							}
+								}
+							]
 						}
 					]
 				}
@@ -147,5 +157,6 @@
 		}
 	],
 	"processor": "EncounterFormProcessor",
-	"referencedForms": []
+	"referencedForms": [],
+	"encounterType": "4224f8bf-11b2-4e47-a958-1dbdfd7fa41d"
 }
\ No newline at end of file