diff --git a/src/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline_profile.xml b/src/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline_profile.xml
index 23dfe96dc..ececb19dc 100644
--- a/src/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline_profile.xml
+++ b/src/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline_profile.xml
@@ -2444,23 +2444,18 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="EXAMINE"/>
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
-			<add position="starting" by-id="ac-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ac-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ac-1_smt.a.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+			<add position="starting" by-id="ac-1_smt.a">
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="ac-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
-			<add position="starting" by-id="ac-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ac-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+			<add position="starting" by-id="ac-1_smt.c">
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="ac-10">
@@ -3514,25 +3509,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="at-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="at-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="at-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="at-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="at-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="at-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="at-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="at-2">
@@ -3698,25 +3685,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="au-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="au-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="au-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="au-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="au-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="au-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="au-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="au-10">
@@ -4262,25 +4241,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="ca-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ca-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ca-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="ca-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="ca-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ca-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ca-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="ca-2">
@@ -4772,25 +4743,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="cm-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cm-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cm-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="cm-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="cm-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cm-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cm-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="cm-10">
@@ -5641,25 +5604,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="cp-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cp-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cp-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="cp-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="cp-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cp-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cp-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="cp-10">
@@ -6424,25 +6379,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="ia-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ia-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ia-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="ia-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="ia-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ia-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ia-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="ia-12.2">
@@ -7167,25 +7114,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="ir-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ir-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ir-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="ir-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="ir-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ir-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ir-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="ir-2">
@@ -7710,25 +7649,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="ma-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ma-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ma-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="ma-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="ma-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ma-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ma-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="ma-2">
@@ -8038,25 +7969,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="mp-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="mp-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="mp-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="mp-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="mp-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="mp-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="mp-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="mp-2">
@@ -8334,25 +8257,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="pe-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pe-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pe-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="pe-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="pe-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pe-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pe-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="pe-10">
@@ -8940,25 +8855,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="pl-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pl-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pl-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="pl-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="pl-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pl-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pl-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="pl-11">
@@ -9311,25 +9218,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="ps-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ps-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ps-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="ps-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="ps-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ps-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ps-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="ps-2">
@@ -9618,25 +9517,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="ra-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ra-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ra-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="ra-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="ra-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ra-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ra-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="ra-2">
@@ -9991,25 +9882,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="sa-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sa-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sa-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="sa-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="sa-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sa-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sa-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="sa-11">
@@ -10908,25 +10791,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="sc-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sc-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sc-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="sc-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="sc-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sc-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sc-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="sc-10">
@@ -11797,25 +11672,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="si-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="si-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="si-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="si-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="si-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="si-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="si-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="si-11">
@@ -12534,25 +12401,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="sr-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sr-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sr-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="sr-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="sr-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sr-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sr-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="sr-10">
diff --git a/src/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline_profile.xml b/src/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline_profile.xml
index 8c89a0db7..102893957 100644
--- a/src/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline_profile.xml
+++ b/src/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline_profile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-model href="https://github.com/usnistgov/OSCAL/releases/download/v1.1.1/oscal_complete_schema.xsd" schematypens="http://www.w3.org/2001/XMLSchema" title="OSCAL complete schema"?>
-<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0" uuid="f8eb47a7-026d-4619-9b4c-ee8e98a76054">
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0" uuid="7486c1b0-e2e9-4597-8ce1-c7d7fe21c90a">
     <metadata>
         <title>FedRAMP Rev 5 Low Baseline</title>
         <published>2023-08-31T00:00:00Z</published>
@@ -1352,23 +1352,18 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="EXAMINE"/>
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
-            <add position="starting" by-id="ac-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ac-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ac-1_smt.a.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+            <add position="starting" by-id="ac-1_smt.a">
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="ac-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
-            <add position="starting" by-id="ac-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ac-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+            <add position="starting" by-id="ac-1_smt.c">
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="ac-14">
@@ -1779,25 +1774,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="at-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="at-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="at-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="at-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="at-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="at-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="at-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="at-2">
@@ -1953,25 +1940,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="au-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="au-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="au-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="au-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="au-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="au-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="au-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="au-12">
@@ -2279,25 +2258,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="ca-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ca-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ca-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="ca-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="ca-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ca-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ca-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="ca-2">
@@ -2706,25 +2677,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="cm-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="cm-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="cm-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="cm-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="cm-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="cm-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="cm-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="cm-10">
@@ -3017,25 +2980,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="cp-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="cp-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="cp-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="cp-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="cp-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="cp-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="cp-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="cp-10">
@@ -3364,25 +3319,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="ia-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ia-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ia-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="ia-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="ia-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ia-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ia-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="ia-2">
@@ -3872,25 +3819,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="ir-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ir-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ir-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="ir-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="ir-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ir-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ir-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="ir-2">
@@ -4179,25 +4118,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="ma-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ma-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ma-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="ma-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="ma-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ma-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ma-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="ma-2">
@@ -4364,25 +4295,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="mp-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="mp-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="mp-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="mp-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="mp-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="mp-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="mp-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="mp-2">
@@ -4485,25 +4408,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="pe-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="pe-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="pe-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="pe-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="pe-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="pe-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="pe-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="pe-12">
@@ -4861,25 +4776,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="pl-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="pl-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="pl-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="pl-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="pl-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="pl-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="pl-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="pl-11">
@@ -5242,25 +5149,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="ps-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ps-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ps-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="ps-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="ps-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ps-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ps-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="ps-2">
@@ -5526,25 +5425,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="ra-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ra-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ra-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="ra-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="ra-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ra-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="ra-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="ra-2">
@@ -5838,25 +5729,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="sa-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="sa-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="sa-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="sa-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="sa-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="sa-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="sa-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="sa-2">
@@ -6327,25 +6210,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="sc-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="sc-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="sc-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="sc-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="sc-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="sc-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="sc-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="sc-22">
@@ -6848,25 +6723,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="si-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="si-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="si-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="si-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="si-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="si-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="si-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="si-12">
@@ -7138,25 +7005,17 @@
                 <prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
             </add>
             <add position="starting" by-id="sr-1_smt.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="sr-1_smt.a.1.a">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="sr-1_smt.a.1.b">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
             <add position="starting" by-id="sr-1_smt.b">
                 <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
             </add>
             <add position="starting" by-id="sr-1_smt.c">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="sr-1_smt.c.1">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-            </add>
-            <add position="starting" by-id="sr-1_smt.c.2">
-                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+                <prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+                    <remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+                </prop>		
             </add>
         </alter>
         <alter control-id="sr-10">
diff --git a/src/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline_profile.xml b/src/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline_profile.xml
index bf7b4be77..5e45fb979 100644
--- a/src/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline_profile.xml
+++ b/src/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline_profile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-model href="https://github.com/usnistgov/OSCAL/releases/download/v1.1.1/oscal_complete_schema.xsd" schematypens="http://www.w3.org/2001/XMLSchema" title="OSCAL complete schema"?>
-<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0" uuid="82dc44fc-62c2-4187-9682-63ef61abae7a">
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0" uuid="4c9ec282-326b-4e80-8ab0-49a261cf59da">
 	<metadata>
 		<title>FedRAMP Rev 5 Moderate Baseline</title>
 		<published>2023-08-31T00:00:00Z</published>
@@ -2112,23 +2112,18 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="EXAMINE"/>
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
-			<add position="starting" by-id="ac-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ac-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ac-1_smt.a.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+			<add position="starting" by-id="ac-1_smt.a">
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="ac-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
-			<add position="starting" by-id="ac-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ac-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+			<add position="starting" by-id="ac-1_smt.c">
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="ac-11">
@@ -3103,25 +3098,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="at-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="at-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="at-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="at-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="at-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="at-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="at-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="at-2">
@@ -3287,25 +3274,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="au-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="au-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="au-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="au-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="au-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="au-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="au-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="au-12">
@@ -3703,25 +3682,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="ca-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ca-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ca-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="ca-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="ca-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ca-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ca-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="ca-2">
@@ -4194,25 +4165,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="cm-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cm-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cm-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="cm-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="cm-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cm-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cm-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="cm-10">
@@ -4918,25 +4881,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="cp-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cp-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cp-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="cp-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="cp-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cp-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="cp-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="cp-10">
@@ -5540,25 +5495,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="ia-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ia-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ia-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="ia-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="ia-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ia-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ia-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="ia-12.2">
@@ -6247,25 +6194,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="ir-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ir-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ir-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="ir-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="ir-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ir-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ir-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="ir-2">
@@ -6714,25 +6653,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="ma-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ma-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ma-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="ma-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="ma-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ma-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ma-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="ma-2">
@@ -7009,25 +6940,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="mp-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="mp-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="mp-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="mp-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="mp-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="mp-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="mp-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="mp-2">
@@ -7258,25 +7181,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="pe-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pe-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pe-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="pe-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="pe-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pe-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pe-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="pe-10">
@@ -7785,25 +7700,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="pl-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pl-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pl-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="pl-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="pl-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pl-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="pl-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="pl-11">
@@ -8167,25 +8074,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="ps-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ps-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ps-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="ps-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="ps-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ps-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ps-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="ps-2">
@@ -8469,25 +8368,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="ra-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ra-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ra-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="ra-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="ra-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ra-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="ra-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="ra-2">
@@ -8817,25 +8708,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="sa-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sa-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sa-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="sa-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="sa-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sa-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sa-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="sa-11">
@@ -9651,25 +9534,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="sc-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sc-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sc-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="sc-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="sc-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sc-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sc-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="sc-10">
@@ -10467,25 +10342,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="si-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="si-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="si-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="si-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="si-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="si-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="si-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="si-11">
@@ -11074,25 +10941,17 @@
 				<prop ns="https://fedramp.gov/ns/oscal" name="method" class="fedramp" value="INTERVIEW"/>
 			</add>
 			<add position="starting" by-id="sr-1_smt.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sr-1_smt.a.1.a">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sr-1_smt.a.1.b">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 			<add position="starting" by-id="sr-1_smt.b">
 				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
 			</add>
 			<add position="starting" by-id="sr-1_smt.c">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sr-1_smt.c.1">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
-			</add>
-			<add position="starting" by-id="sr-1_smt.c.2">
-				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point."/>
+				<prop ns="https://fedramp.gov/ns/oscal" name="response-point" value="You must fill in this response point.">
+					<remarks><p>This response must address all control sub-statement requirements.</p></remarks>
+				</prop>		
 			</add>
 		</alter>
 		<alter control-id="sr-10">