diff --git a/GAD-7.json b/GAD-7.json
index f89174e..da8d1ff 100644
--- a/GAD-7.json
+++ b/GAD-7.json
@@ -1,14 +1,22 @@
 {
-  "status": "draft",
+  "id": "CIRG_GAD7",
+  "code": [
+    {
+      "code": "69737-5",
+      "system": "http://loinc.org"
+      "display": "Generalized anxiety disorder 7 item (GAD-7)"
+    }
+  ],
   "title": "Generalized anxiety disorder 7 item (GAD-7)",
   "resourceType": "Questionnaire",
+  "status": "active",
   "meta": {
     "profile": [
       "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire|2.7"
     ],
     "tag": [
       {
-        "code": "lformsVersion: 29.2.1"
+        "code": "lformsVersion: 32.0.0"
       }
     ]
   },
@@ -18,25 +26,9 @@
       "code": [
         {
           "code": "69725-0",
-          "display": "Feeling nervous, anxious or on edge",
           "system": "http://loinc.org"
         }
       ],
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
-          "valueCodeableConcept": {
-            "coding": [
-              {
-                "system": "http://hl7.org/fhir/questionnaire-item-control",
-                "code": "drop-down",
-                "display": "Drop down"
-              }
-            ],
-            "text": "Drop down"
-          }
-        }
-      ],
       "required": false,
       "linkId": "/69725-0",
       "text": "Feeling nervous, anxious or on edge",
@@ -112,25 +104,9 @@
       "code": [
         {
           "code": "68509-9",
-          "display": "Over the past 2 weeks have you not been able to stop or control worrying",
           "system": "http://loinc.org"
         }
       ],
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
-          "valueCodeableConcept": {
-            "coding": [
-              {
-                "system": "http://hl7.org/fhir/questionnaire-item-control",
-                "code": "drop-down",
-                "display": "Drop down"
-              }
-            ],
-            "text": "Drop down"
-          }
-        }
-      ],
       "required": false,
       "linkId": "/68509-9",
       "text": "Over the past 2 weeks have you not been able to stop or control worrying",
@@ -206,25 +182,9 @@
       "code": [
         {
           "code": "69733-4",
-          "display": "Worrying too much about different things",
           "system": "http://loinc.org"
         }
       ],
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
-          "valueCodeableConcept": {
-            "coding": [
-              {
-                "system": "http://hl7.org/fhir/questionnaire-item-control",
-                "code": "drop-down",
-                "display": "Drop down"
-              }
-            ],
-            "text": "Drop down"
-          }
-        }
-      ],
       "required": false,
       "linkId": "/69733-4",
       "text": "Worrying too much about different things",
@@ -300,25 +260,9 @@
       "code": [
         {
           "code": "69734-2",
-          "display": "Trouble relaxing",
           "system": "http://loinc.org"
         }
       ],
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
-          "valueCodeableConcept": {
-            "coding": [
-              {
-                "system": "http://hl7.org/fhir/questionnaire-item-control",
-                "code": "drop-down",
-                "display": "Drop down"
-              }
-            ],
-            "text": "Drop down"
-          }
-        }
-      ],
       "required": false,
       "linkId": "/69734-2",
       "text": "Trouble relaxing",
@@ -394,25 +338,9 @@
       "code": [
         {
           "code": "69735-9",
-          "display": "Being so restless that it is hard to sit still",
           "system": "http://loinc.org"
         }
       ],
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
-          "valueCodeableConcept": {
-            "coding": [
-              {
-                "system": "http://hl7.org/fhir/questionnaire-item-control",
-                "code": "drop-down",
-                "display": "Drop down"
-              }
-            ],
-            "text": "Drop down"
-          }
-        }
-      ],
       "required": false,
       "linkId": "/69735-9",
       "text": "Being so restless that it is hard to sit still",
@@ -488,25 +416,9 @@
       "code": [
         {
           "code": "69689-8",
-          "display": "Becoming easily annoyed or irritable.",
           "system": "http://loinc.org"
         }
       ],
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
-          "valueCodeableConcept": {
-            "coding": [
-              {
-                "system": "http://hl7.org/fhir/questionnaire-item-control",
-                "code": "drop-down",
-                "display": "Drop down"
-              }
-            ],
-            "text": "Drop down"
-          }
-        }
-      ],
       "required": false,
       "linkId": "/69689-8",
       "text": "Becoming easily annoyed or irritable.",
@@ -582,25 +494,9 @@
       "code": [
         {
           "code": "69736-7",
-          "display": "Feeling afraid as if something awful might happen",
           "system": "http://loinc.org"
         }
       ],
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
-          "valueCodeableConcept": {
-            "coding": [
-              {
-                "system": "http://hl7.org/fhir/questionnaire-item-control",
-                "code": "drop-down",
-                "display": "Drop down"
-              }
-            ],
-            "text": "Drop down"
-          }
-        }
-      ],
       "required": false,
       "linkId": "/69736-7",
       "text": "Feeling afraid as if something awful might happen",
@@ -676,15 +572,16 @@
       "code": [
         {
           "code": "70274-6",
-          "display": "Generalized anxiety disorder 7 item total score",
-          "system": "http://loinc.org"
+          "display": "Generalized anxiety disorder 7 item total score"
         }
       ],
       "extension": [
         {
           "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-unit",
           "valueCoding": {
-            "display": "{score}"
+            "code": "{score}",
+            "display": "{score}",
+            "system": "http://unitsofmeasure.org"
           }
         }
       ],
@@ -694,6 +591,3 @@
     }
   ]
 }
-
-
-