diff --git a/input/pagecontent/requests/OpioidCDSREC05/request-example-rec-05-mme-greater-than-fifty.json b/input/pagecontent/requests/OpioidCDSREC05/request-example-rec-05-mme-greater-than-fifty.json
index e3232df9..b2ce6192 100644
--- a/input/pagecontent/requests/OpioidCDSREC05/request-example-rec-05-mme-greater-than-fifty.json
+++ b/input/pagecontent/requests/OpioidCDSREC05/request-example-rec-05-mme-greater-than-fifty.json
@@ -6,87 +6,100 @@
     "userId": "Practitioner/example",
     "patientId": "Patient/example-rec-05-mme-greater-than-fifty",
     "encounterId": "Encounter/example-rec-05-mme-greater-than-fifty-context",
-    "selections": [ "MedicationRequest/example-rec-05-mme-greater-than-fifty-context" ],
-    "draftOrders":
-      {
-        "resourceType": "MedicationRequest",
-        "extension": [
-          {
-            "url": "http://fhir.org/guides/cdc/opioid-cds/StructureDefinition/dataDateRoller",
+    "draftOrders": {
+      "resourceType": "Bundle",
+      "id": "opioidcds-05-bundle",
+      "type": "transaction",
+      "entry": [
+        {
+          "resource": {
+            "resourceType": "MedicationRequest",
             "extension": [
               {
-                "url": "dateLastUpdated",
-                "valueDateTime": "2022-04-08"
-              },
-              {
-                "url": "frequency",
-                "valueDuration": {
-                  "value": 30.0,
-                  "unit": "days",
-                  "system": "http://unitsofmeasure.org",
-                  "code": "d"
+                "url": "http://fhir.org/guides/cdc/opioid-cds/StructureDefinition/dataDateRoller",
+                "extension": [
+                  {
+                    "url": "dateLastUpdated",
+                    "valueDateTime": "2022-07-08"
+                  },
+                  {
+                    "url": "frequency",
+                    "valueDuration": {
+                      "value": 30.0,
+                      "unit": "days",
+                      "system": "http://unitsofmeasure.org",
+                      "code": "d"
+                    }
+                  }
+                ]
+              }
+            ],
+            "id": "example-rec-05-mme-greater-than-fifty-context",
+            "status": "active",
+            "intent": "order",
+            "category": {
+              "coding": [
+                {
+                  "system": "http://terminology.hl7.org/CodeSystem/medicationrequest-category",
+                  "code": "community"
+                }
+              ]
+            },
+            "medicationCodeableConcept": {
+              "coding": [
+                {
+                  "system": "http://www.nlm.nih.gov/research/umls/rxnorm",
+                  "code": "197696",
+                  "display": "72 HR Fentanyl 0.075 MG/HR Transdermal System"
                 }
+              ]
+            },
+            "subject": {
+              "reference": "Patient/example-rec-05-mme-greater-than-fifty"
+            },
+            "encounter": {
+              "reference": "Encounter/example-rec-05-mme-greater-than-fifty-context"
+            },
+            "authoredOn": "2022-07-08",
+            "dosageInstruction": [
+              {
+                "timing": {
+                  "repeat": {
+                    "frequency": 1,
+                    "period": 3.0,
+                    "periodUnit": "d"
+                  }
+                },
+                "asNeededBoolean": false,
+                "doseAndRate": [
+                  {
+                    "doseQuantity": {
+                      "value": 1.0,
+                      "unit": "patch",
+                      "system": "http://unitsofmeasure.org",
+                      "code": "{patch}"
+                    }
+                  }
+                ]
               }
-            ]
-          }
-        ],
-        "id": "example-rec-05-mme-greater-than-fifty-context",
-        "status": "active",
-        "intent": "order",
-        "category": {
-          "coding": [
-            {
-              "system": "http://terminology.hl7.org/CodeSystem/medicationrequest-category",
-              "code": "community"
-            }
-          ]
-        },
-        "medicationCodeableConcept": {
-          "coding": [
-            {
-              "system": "http://www.nlm.nih.gov/research/umls/rxnorm",
-              "code": "197696",
-              "display": "72 HR Fentanyl 0.075 MG/HR Transdermal System"
-            }
-          ]
-        },
-        "subject": {
-          "reference": "Patient/example-rec-05-mme-greater-than-fifty"
-        },
-        "encounter": {
-          "reference": "Encounter/example-rec-05-mme-greater-than-fifty-context"
-        },
-        "authoredOn": "2022-04-08",
-        "dosageInstruction": [
-          {
-            "timing": {
-              "repeat": {
-                "frequency": 1,
-                "period": 3.0,
-                "periodUnit": "d"
+            ],
+            "dispenseRequest": {
+              "validityPeriod": {
+                "start": "2022-07-08",
+                "end": "2022-10-08"
+              },
+              "numberOfRepeatsAllowed": 3,
+              "expectedSupplyDuration": {
+                "value": 30,
+                "unit": "days",
+                "system": "http://unitsofmeasure.org",
+                "code": "d"
               }
-            },
-            "asNeededBoolean": false,
-            "doseQuantity": {
-              "value": 1.0,
-              "unit": "patch"
             }
           }
-        ],
-        "dispenseRequest": {
-          "validityPeriod": {
-            "start": "2022-04-08",
-            "end": "2022-10-08"
-          },
-          "numberOfRepeatsAllowed": 3,
-          "expectedSupplyDuration": {
-            "value": 30,
-            "unit": "days",
-            "system": "http://unitsofmeasure.org",
-            "code": "d"
-          }
         }
-      }
+      ]
+    }
   },
   "prefetch": {
     "item1": null,
@@ -133,4 +146,4 @@
     "item12": null,
     "item13": null
   }
-}
+}
\ No newline at end of file
diff --git a/input/pagecontent/requests/OpioidCDSREC05/request-example-rec-05-mme-less-than-fifty.json b/input/pagecontent/requests/OpioidCDSREC05/request-example-rec-05-mme-less-than-fifty.json
index 628d3f43..e92d686e 100644
--- a/input/pagecontent/requests/OpioidCDSREC05/request-example-rec-05-mme-less-than-fifty.json
+++ b/input/pagecontent/requests/OpioidCDSREC05/request-example-rec-05-mme-less-than-fifty.json
@@ -6,87 +6,94 @@
     "userId": "Practitioner/example",
     "patientId": "Patient/example-rec-05-mme-less-than-fifty",
     "encounterId": "Encounter/example-rec-05-mme-less-than-fifty-context",
-    "selections": [ "MedicationRequest/example-rec-05-mme-less-than-fifty-context" ],
-    "draftOrders": 
-      {
-        "resourceType": "MedicationRequest",
-        "extension": [
-          {
-            "url": "http://fhir.org/guides/cdc/opioid-cds/StructureDefinition/dataDateRoller",
+    "draftOrders": {
+      "resourceType": "Bundle",
+      "id": "opioidcds-05-bundle",
+      "type": "transaction",
+      "entry": [
+        {
+          "resource": {
+            "resourceType": "MedicationRequest",
             "extension": [
               {
-                "url": "dateLastUpdated",
-                "valueDateTime": "2022-04-08"
-              },
+                "url": "http://fhir.org/guides/cdc/opioid-cds/StructureDefinition/dataDateRoller",
+                "extension": [
+                  {
+                    "url": "dateLastUpdated",
+                    "valueDateTime": "2022-04-08"
+                  },
+                  {
+                    "url": "frequency",
+                    "valueDuration": {
+                      "value": 30.0,
+                      "unit": "days",
+                      "system": "http://unitsofmeasure.org",
+                      "code": "d"
+                    }
+                  }
+                ]
+              }
+            ],
+            "id": "example-rec-05-mme-less-than-fifty-context",
+            "status": "active",
+            "intent": "order",
+            "category": {
+              "coding": [
+                {
+                  "system": "http://terminology.hl7.org/CodeSystem/medicationrequest-category",
+                  "code": "community"
+                }
+              ]
+            },
+            "medicationCodeableConcept": {
+              "coding": [
+                {
+                  "system": "http://www.nlm.nih.gov/research/umls/rxnorm",
+                  "code": "197696",
+                  "display": "72 HR Fentanyl 0.075 MG/HR Transdermal System"
+                }
+              ]
+            },
+            "subject": {
+              "reference": "Patient/example-rec-05-mme-less-than-fifty"
+            },
+            "encounter": {
+              "reference": "Encounter/example-rec-05-mme-less-than-fifty-context"
+            },
+            "authoredOn": "2022-04-08",
+            "dosageInstruction": [
               {
-                "url": "frequency",
-                "valueDuration": {
-                  "value": 30.0,
-                  "unit": "days",
-                  "system": "http://unitsofmeasure.org",
-                  "code": "d"
+                "timing": {
+                  "repeat": {
+                    "frequency": 1,
+                    "period": 12.0,
+                    "periodUnit": "d"
+                  }
+                },
+                "asNeededBoolean": false,
+                "doseQuantity": {
+                  "value": 0.2,
+                  "unit": "patch"
                 }
               }
-            ]
-          }
-        ],
-        "id": "example-rec-05-mme-less-than-fifty-context",
-        "status": "active",
-        "intent": "order",
-        "category": {
-          "coding": [
-            {
-              "system": "http://terminology.hl7.org/CodeSystem/medicationrequest-category",
-              "code": "community"
-            }
-          ]
-        },
-        "medicationCodeableConcept": {
-          "coding": [
-            {
-              "system": "http://www.nlm.nih.gov/research/umls/rxnorm",
-              "code": "197696",
-              "display": "72 HR Fentanyl 0.075 MG/HR Transdermal System"
-            }
-          ]
-        },
-        "subject": {
-          "reference": "Patient/example-rec-05-mme-less-than-fifty"
-        },
-        "encounter": {
-          "reference": "Encounter/example-rec-05-mme-less-than-fifty-context"
-        },
-        "authoredOn": "2022-04-08",
-        "dosageInstruction": [
-          {
-            "timing": {
-              "repeat": {
-                "frequency": 1,
-                "period": 12.0,
-                "periodUnit": "d"
+            ],
+            "dispenseRequest": {
+              "validityPeriod": {
+                "start": "2022-04-08",
+                "end": "2022-10-08"
+              },
+              "numberOfRepeatsAllowed": 3,
+              "expectedSupplyDuration": {
+                "value": 30,
+                "unit": "days",
+                "system": "http://unitsofmeasure.org",
+                "code": "d"
               }
-            },
-            "asNeededBoolean": false,
-            "doseQuantity": {
-              "value": 1.0,
-              "unit": "patch"
             }
           }
-        ],
-        "dispenseRequest": {
-          "validityPeriod": {
-            "start": "2022-04-08",
-            "end": "2022-10-08"
-          },
-          "numberOfRepeatsAllowed": 3,
-          "expectedSupplyDuration": {
-            "value": 30,
-            "unit": "days",
-            "system": "http://unitsofmeasure.org",
-            "code": "d"
-          }
         }
-      }
+      ]
+    }
   },
   "prefetch": {
     "item1": null,
@@ -133,4 +140,4 @@
     "item12": null,
     "item13": null
   }
-}
+}
\ No newline at end of file