diff --git a/force-app/main/default/flexipages/smoke-01-diff-add_component.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-01-diff-add_component.flexipage-meta.xml
index e97b59f..144f6f7 100644
--- a/force-app/main/default/flexipages/smoke-01-diff-add_component.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-01-diff-add_component.flexipage-meta.xml
@@ -9,5 +9,10 @@
         <componentName>force:detailPanel</componentName>
       </componentInstance>
     </itemInstances>
+    <itemInstances>
+      <componentInstance>
+        <componentName>flowruntime:interview</componentName>
+      </componentInstance>
+    </itemInstances>
   </flexiPageRegions>
 </FlexiPage>
diff --git a/force-app/main/default/flexipages/smoke-02-diff-change_template.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-02-diff-change_template.flexipage-meta.xml
index 377ab02..4912d30 100644
--- a/force-app/main/default/flexipages/smoke-02-diff-change_template.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-02-diff-change_template.flexipage-meta.xml
@@ -3,6 +3,6 @@
   <type>RecordPage</type>
   <sobjectType>Contact</sobjectType>
   <template>
-    <name>recordHomeTemplateDesktop</name>
+    <name>recordHomeWithSubheaderTemplateDesktop</name>
   </template>
 </FlexiPage>
diff --git a/force-app/main/default/flexipages/smoke-03-diff-insert_component_top.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-03-diff-insert_component_top.flexipage-meta.xml
index 5479815..ea8dce7 100644
--- a/force-app/main/default/flexipages/smoke-03-diff-insert_component_top.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-03-diff-insert_component_top.flexipage-meta.xml
@@ -6,6 +6,11 @@
     <name>main</name>
     <type>Region</type>
     <mode>Replace</mode>
+    <itemInstances>
+      <componentInstance>
+        <componentName>force:highlightsPanel</componentName>
+      </componentInstance>
+    </itemInstances>
     <itemInstances>
       <componentInstance>
         <componentName>force:detailPanel</componentName>
diff --git a/force-app/main/default/flexipages/smoke-04-diff-modify_component_property.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-04-diff-modify_component_property.flexipage-meta.xml
index d7e412a..8f9e747 100644
--- a/force-app/main/default/flexipages/smoke-04-diff-modify_component_property.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-04-diff-modify_component_property.flexipage-meta.xml
@@ -9,7 +9,7 @@
         <componentName>force:highlightsPanel</componentName>
         <componentInstanceProperties>
           <name>numVisibleActions</name>
-          <value>3</value>
+          <value>5</value>
         </componentInstanceProperties>
       </componentInstance>
     </itemInstances>
diff --git a/force-app/main/default/flexipages/smoke-05-diff-noop_save.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-05-diff-noop_save.flexipage-meta.xml
index 384cc94..51036f7 100644
--- a/force-app/main/default/flexipages/smoke-05-diff-noop_save.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-05-diff-noop_save.flexipage-meta.xml
@@ -6,50 +6,50 @@
     <name>recordHomeTemplateDesktop</name>
   </template>
   <flexiPageRegions>
-    <name>main</name>
+    <name>header</name>
     <type>Region</type>
     <mode>Replace</mode>
     <itemInstances>
       <componentInstance>
-        <componentName>flexipage:tab</componentName>
-        <componentInstanceProperties>
-          <name>body</name>
-          <value>Facet-11111111-1111-1111-1111-111111111111</value>
-        </componentInstanceProperties>
+        <componentName>force:highlightsPanel</componentName>
         <componentInstanceProperties>
-          <name>label</name>
-          <value>Details</value>
+          <name>numVisibleActions</name>
+          <value>3</value>
         </componentInstanceProperties>
       </componentInstance>
     </itemInstances>
   </flexiPageRegions>
   <flexiPageRegions>
-    <name>Facet-11111111-1111-1111-1111-111111111111</name>
+    <name>Facet-22222222-2222-2222-2222-222222222222</name>
     <type>Facet</type>
     <itemInstances>
       <componentInstance>
         <componentName>force:detailPanel</componentName>
-        <componentInstanceProperties>
-          <name>z</name>
-          <value>2</value>
-        </componentInstanceProperties>
         <componentInstanceProperties>
           <name>a</name>
           <value>1</value>
         </componentInstanceProperties>
+        <componentInstanceProperties>
+          <name>z</name>
+          <value>2</value>
+        </componentInstanceProperties>
       </componentInstance>
     </itemInstances>
   </flexiPageRegions>
   <flexiPageRegions>
-    <name>header</name>
+    <name>main</name>
     <type>Region</type>
     <mode>Replace</mode>
     <itemInstances>
       <componentInstance>
-        <componentName>force:highlightsPanel</componentName>
+        <componentName>flexipage:tab</componentName>
         <componentInstanceProperties>
-          <name>numVisibleActions</name>
-          <value>3</value>
+          <name>label</name>
+          <value>Details</value>
+        </componentInstanceProperties>
+        <componentInstanceProperties>
+          <name>body</name>
+          <value>Facet-22222222-2222-2222-2222-222222222222</value>
         </componentInstanceProperties>
       </componentInstance>
     </itemInstances>
diff --git a/force-app/main/default/flexipages/smoke-06-template-appHomeTemplateHeaderTwoColumns15LeftSidebar.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-06-template-appHomeTemplateHeaderTwoColumns15LeftSidebar.flexipage-meta.xml
index db0ec8b..9a9d93f 100644
--- a/force-app/main/default/flexipages/smoke-06-template-appHomeTemplateHeaderTwoColumns15LeftSidebar.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-06-template-appHomeTemplateHeaderTwoColumns15LeftSidebar.flexipage-meta.xml
@@ -22,10 +22,6 @@
                 <identifier>flexipage_reportChart</identifier>
             </componentInstance>
         </itemInstances>
-        <name>region1</name>
-        <type>Region</type>
-    </flexiPageRegions>
-    <flexiPageRegions>
         <itemInstances>
             <componentInstance>
                 <componentInstanceProperties>
@@ -34,38 +30,34 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>richTextValue</name>
-                    <value>&lt;p&gt;hello&lt;/p&gt;</value>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:richText</componentName>
-                <identifier>flexipage_richText</identifier>
+                <identifier>flexipage_richText4</identifier>
             </componentInstance>
         </itemInstances>
-        <name>region2</name>
+        <name>region1</name>
         <type>Region</type>
     </flexiPageRegions>
     <flexiPageRegions>
         <itemInstances>
             <componentInstance>
                 <componentInstanceProperties>
-                    <name>entityNames</name>
-                    <valueList>
-                        <valueListItems>
-                            <value>ApiAnomalyEventStore</value>
-                        </valueListItems>
-                    </valueList>
-                </componentInstanceProperties>
-                <componentInstanceProperties>
-                    <name>label</name>
-                    <value>Standard.RecentItems</value>
+                    <name>decorate</name>
+                    <value>true</value>
                 </componentInstanceProperties>
                 <componentInstanceProperties>
-                    <name>maxRecords</name>
-                    <value>3</value>
+                    <name>richTextValue</name>
+                    <value>&lt;p&gt;hello, revised&lt;/p&gt;</value>
                 </componentInstanceProperties>
-                <componentName>flexipage:recentItems</componentName>
-                <identifier>flexipage_recentItems</identifier>
+                <componentName>flexipage:richText</componentName>
+                <identifier>flexipage_richText</identifier>
             </componentInstance>
         </itemInstances>
+        <name>region2</name>
+        <type>Region</type>
+    </flexiPageRegions>
+    <flexiPageRegions>
         <name>region3</name>
         <type>Region</type>
     </flexiPageRegions>
diff --git a/force-app/main/default/flexipages/smoke-07-template-appHomeTemplateThreeColumns.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-07-template-appHomeTemplateThreeColumns.flexipage-meta.xml
index cf0ab5f..ad5cd14 100644
--- a/force-app/main/default/flexipages/smoke-07-template-appHomeTemplateThreeColumns.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-07-template-appHomeTemplateThreeColumns.flexipage-meta.xml
@@ -15,10 +15,6 @@
                 <identifier>flexipage_richText</identifier>
             </componentInstance>
         </itemInstances>
-        <name>region1</name>
-        <type>Region</type>
-    </flexiPageRegions>
-    <flexiPageRegions>
         <itemInstances>
             <componentInstance>
                 <componentInstanceProperties>
@@ -27,13 +23,13 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>richTextValue</name>
-                    <value>&lt;p&gt;left&lt;/p&gt;</value>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:richText</componentName>
-                <identifier>flexipage_richText2</identifier>
+                <identifier>flexipage_richText4</identifier>
             </componentInstance>
         </itemInstances>
-        <name>region2</name>
+        <name>region1</name>
         <type>Region</type>
     </flexiPageRegions>
     <flexiPageRegions>
@@ -45,12 +41,16 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>richTextValue</name>
-                    <value>&lt;p&gt;center&lt;/p&gt;</value>
+                    <value>&lt;p&gt;left, revised&lt;/p&gt;</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:richText</componentName>
-                <identifier>flexipage_richText3</identifier>
+                <identifier>flexipage_richText2</identifier>
             </componentInstance>
         </itemInstances>
+        <name>region2</name>
+        <type>Region</type>
+    </flexiPageRegions>
+    <flexiPageRegions>
         <name>region3</name>
         <type>Region</type>
     </flexiPageRegions>
diff --git a/force-app/main/default/flexipages/smoke-08-template-appHomeTemplateTwoColumns.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-08-template-appHomeTemplateTwoColumns.flexipage-meta.xml
index 647bf0a..37a6c46 100644
--- a/force-app/main/default/flexipages/smoke-08-template-appHomeTemplateTwoColumns.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-08-template-appHomeTemplateTwoColumns.flexipage-meta.xml
@@ -11,6 +11,20 @@
                 <identifier>forceChatter_exposedFeed</identifier>
             </componentInstance>
         </itemInstances>
+        <itemInstances>
+            <componentInstance>
+                <componentInstanceProperties>
+                    <name>decorate</name>
+                    <value>true</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>richTextValue</name>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
+                </componentInstanceProperties>
+                <componentName>flexipage:richText</componentName>
+                <identifier>flexipage_richText4</identifier>
+            </componentInstance>
+        </itemInstances>
         <name>column1</name>
         <type>Region</type>
     </flexiPageRegions>
@@ -31,7 +45,7 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>maxRecords</name>
-                    <value>3</value>
+                    <value>5</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:recentItems</componentName>
                 <identifier>flexipage_recentItems</identifier>
diff --git a/force-app/main/default/flexipages/smoke-09-template-appHomeTemplateTwoColumnsStacked.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-09-template-appHomeTemplateTwoColumnsStacked.flexipage-meta.xml
index fbea00e..bcbf800 100644
--- a/force-app/main/default/flexipages/smoke-09-template-appHomeTemplateTwoColumnsStacked.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-09-template-appHomeTemplateTwoColumnsStacked.flexipage-meta.xml
@@ -15,10 +15,6 @@
                 <identifier>flexipage_richText</identifier>
             </componentInstance>
         </itemInstances>
-        <name>region1</name>
-        <type>Region</type>
-    </flexiPageRegions>
-    <flexiPageRegions>
         <itemInstances>
             <componentInstance>
                 <componentInstanceProperties>
@@ -27,13 +23,13 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>richTextValue</name>
-                    <value>&lt;p&gt;asdfas asdf asdf a&lt;/p&gt;</value>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:richText</componentName>
-                <identifier>flexipage_richText2</identifier>
+                <identifier>flexipage_richText4</identifier>
             </componentInstance>
         </itemInstances>
-        <name>region2</name>
+        <name>region1</name>
         <type>Region</type>
     </flexiPageRegions>
     <flexiPageRegions>
@@ -45,12 +41,16 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>richTextValue</name>
-                    <value>&lt;p&gt;asdfasdf asdf &lt;/p&gt;</value>
+                    <value>&lt;p&gt;asdfas asdf asdf a, revised&lt;/p&gt;</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:richText</componentName>
-                <identifier>flexipage_richText3</identifier>
+                <identifier>flexipage_richText2</identifier>
             </componentInstance>
         </itemInstances>
+        <name>region2</name>
+        <type>Region</type>
+    </flexiPageRegions>
+    <flexiPageRegions>
         <name>region3</name>
         <type>Region</type>
     </flexiPageRegions>
diff --git a/force-app/main/default/flexipages/smoke-10-template-defaultAppHomeTemplate.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-10-template-defaultAppHomeTemplate.flexipage-meta.xml
index d6131f6..60b2ad4 100644
--- a/force-app/main/default/flexipages/smoke-10-template-defaultAppHomeTemplate.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-10-template-defaultAppHomeTemplate.flexipage-meta.xml
@@ -25,12 +25,26 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>pageSize</name>
-                    <value>3</value>
+                    <value>5</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:filterListCard</componentName>
                 <identifier>flexipage_filterListCard</identifier>
             </componentInstance>
         </itemInstances>
+        <itemInstances>
+            <componentInstance>
+                <componentInstanceProperties>
+                    <name>decorate</name>
+                    <value>true</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>richTextValue</name>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
+                </componentInstanceProperties>
+                <componentName>flexipage:richText</componentName>
+                <identifier>flexipage_richText4</identifier>
+            </componentInstance>
+        </itemInstances>
         <name>main</name>
         <type>Region</type>
     </flexiPageRegions>
diff --git a/force-app/main/default/flexipages/smoke-11-template-home_desktopTemplate.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-11-template-home_desktopTemplate.flexipage-meta.xml
index 5d98b75..9819c26 100644
--- a/force-app/main/default/flexipages/smoke-11-template-home_desktopTemplate.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-11-template-home_desktopTemplate.flexipage-meta.xml
@@ -15,10 +15,6 @@
                 <identifier>flexipage_richText</identifier>
             </componentInstance>
         </itemInstances>
-        <name>top</name>
-        <type>Region</type>
-    </flexiPageRegions>
-    <flexiPageRegions>
         <itemInstances>
             <componentInstance>
                 <componentInstanceProperties>
@@ -27,13 +23,13 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>richTextValue</name>
-                    <value>&lt;p&gt;Left&lt;/p&gt;</value>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:richText</componentName>
-                <identifier>flexipage_richText2</identifier>
+                <identifier>flexipage_richText5</identifier>
             </componentInstance>
         </itemInstances>
-        <name>bottomLeft</name>
+        <name>top</name>
         <type>Region</type>
     </flexiPageRegions>
     <flexiPageRegions>
@@ -45,13 +41,13 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>richTextValue</name>
-                    <value>&lt;p&gt;Right&lt;/p&gt;</value>
+                    <value>&lt;p&gt;Left, revised&lt;/p&gt;</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:richText</componentName>
-                <identifier>flexipage_richText3</identifier>
+                <identifier>flexipage_richText2</identifier>
             </componentInstance>
         </itemInstances>
-        <name>bottomRight</name>
+        <name>bottomLeft</name>
         <type>Region</type>
     </flexiPageRegions>
     <flexiPageRegions>
@@ -63,12 +59,16 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>richTextValue</name>
-                    <value>&lt;p&gt;Sidebar&lt;/p&gt;</value>
+                    <value>&lt;p&gt;Right&lt;/p&gt;</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:richText</componentName>
-                <identifier>flexipage_richText4</identifier>
+                <identifier>flexipage_richText3</identifier>
             </componentInstance>
         </itemInstances>
+        <name>bottomRight</name>
+        <type>Region</type>
+    </flexiPageRegions>
+    <flexiPageRegions>
         <name>sidebar</name>
         <type>Region</type>
     </flexiPageRegions>
diff --git a/force-app/main/default/flexipages/smoke-12-template-industries_common_homeTemplateOneRegion.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-12-template-industries_common_homeTemplateOneRegion.flexipage-meta.xml
index 5bc80e1..6096d72 100644
--- a/force-app/main/default/flexipages/smoke-12-template-industries_common_homeTemplateOneRegion.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-12-template-industries_common_homeTemplateOneRegion.flexipage-meta.xml
@@ -9,12 +9,26 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>richTextValue</name>
-                    <value>&lt;p&gt;Home Page&lt;/p&gt;</value>
+                    <value>&lt;p&gt;Home Page, revised&lt;/p&gt;</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:richText</componentName>
                 <identifier>flexipage_richText</identifier>
             </componentInstance>
         </itemInstances>
+        <itemInstances>
+            <componentInstance>
+                <componentInstanceProperties>
+                    <name>decorate</name>
+                    <value>true</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>richTextValue</name>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
+                </componentInstanceProperties>
+                <componentName>flexipage:richText</componentName>
+                <identifier>flexipage_richText2</identifier>
+            </componentInstance>
+        </itemInstances>
         <name>main</name>
         <type>Region</type>
     </flexiPageRegions>
diff --git a/force-app/main/default/flexipages/smoke-13-template-recordHomeLeftSidebarTemplateDesktop.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-13-template-recordHomeLeftSidebarTemplateDesktop.flexipage-meta.xml
index 8248d12..a88d869 100644
--- a/force-app/main/default/flexipages/smoke-13-template-recordHomeLeftSidebarTemplateDesktop.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-13-template-recordHomeLeftSidebarTemplateDesktop.flexipage-meta.xml
@@ -25,7 +25,7 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>numVisibleActions</name>
-                    <value>3</value>
+                    <value>5</value>
                 </componentInstanceProperties>
                 <componentName>force:highlightsPanel</componentName>
                 <identifier>force_highlightsPanel</identifier>
@@ -45,6 +45,20 @@
                 <identifier>runtime_sales_pathassistant_pathAssistant</identifier>
             </componentInstance>
         </itemInstances>
+        <itemInstances>
+            <componentInstance>
+                <componentInstanceProperties>
+                    <name>decorate</name>
+                    <value>true</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>richTextValue</name>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
+                </componentInstanceProperties>
+                <componentName>flexipage:richText</componentName>
+                <identifier>flexipage_richText4</identifier>
+            </componentInstance>
+        </itemInstances>
         <name>header</name>
         <type>Region</type>
     </flexiPageRegions>
@@ -59,16 +73,6 @@
         <type>Region</type>
     </flexiPageRegions>
     <flexiPageRegions>
-        <itemInstances>
-            <componentInstance>
-                <componentInstanceProperties>
-                    <name>showLegacyActivityComposer</name>
-                    <value>false</value>
-                </componentInstanceProperties>
-                <componentName>runtime_sales_activities:activityPanel</componentName>
-                <identifier>runtime_sales_activities_activityPanel</identifier>
-            </componentInstance>
-        </itemInstances>
         <name>main</name>
         <type>Region</type>
     </flexiPageRegions>
diff --git a/force-app/main/default/flexipages/smoke-14-template-recordHomePinnedHeaderTemplateDesktop.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-14-template-recordHomePinnedHeaderTemplateDesktop.flexipage-meta.xml
index 692c8aa..4eb108b 100644
--- a/force-app/main/default/flexipages/smoke-14-template-recordHomePinnedHeaderTemplateDesktop.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-14-template-recordHomePinnedHeaderTemplateDesktop.flexipage-meta.xml
@@ -9,12 +9,26 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>richTextValue</name>
-                    <value>&lt;p&gt;Pinned header&lt;/p&gt;</value>
+                    <value>&lt;p&gt;Pinned header, revised&lt;/p&gt;</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:richText</componentName>
                 <identifier>flexipage_richText</identifier>
             </componentInstance>
         </itemInstances>
+        <itemInstances>
+            <componentInstance>
+                <componentInstanceProperties>
+                    <name>decorate</name>
+                    <value>true</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>richTextValue</name>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
+                </componentInstanceProperties>
+                <componentName>flexipage:richText</componentName>
+                <identifier>flexipage_richText4</identifier>
+            </componentInstance>
+        </itemInstances>
         <name>header</name>
         <type>Region</type>
     </flexiPageRegions>
@@ -43,16 +57,6 @@
         <type>Region</type>
     </flexiPageRegions>
     <flexiPageRegions>
-        <itemInstances>
-            <componentInstance>
-                <componentInstanceProperties>
-                    <name>decorate</name>
-                    <value>true</value>
-                </componentInstanceProperties>
-                <componentName>flexipage:richText</componentName>
-                <identifier>flexipage_richText3</identifier>
-            </componentInstance>
-        </itemInstances>
         <name>rightsidebar</name>
         <type>Region</type>
     </flexiPageRegions>
diff --git a/force-app/main/default/flexipages/smoke-15-template-recordHomeSimpleViewTemplate.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-15-template-recordHomeSimpleViewTemplate.flexipage-meta.xml
index 4d1410b..2b67911 100644
--- a/force-app/main/default/flexipages/smoke-15-template-recordHomeSimpleViewTemplate.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-15-template-recordHomeSimpleViewTemplate.flexipage-meta.xml
@@ -15,6 +15,20 @@
                 <identifier>flexipage_richText</identifier>
             </componentInstance>
         </itemInstances>
+        <itemInstances>
+            <componentInstance>
+                <componentInstanceProperties>
+                    <name>decorate</name>
+                    <value>true</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>richTextValue</name>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
+                </componentInstanceProperties>
+                <componentName>flexipage:richText</componentName>
+                <identifier>flexipage_richText4</identifier>
+            </componentInstance>
+        </itemInstances>
         <name>header</name>
         <type>Region</type>
     </flexiPageRegions>
@@ -27,7 +41,7 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>richTextValue</name>
-                    <value>&lt;p&gt;I don&apos;t know what the diff is&lt;/p&gt;</value>
+                    <value>&lt;p&gt;Now I know what the diff is&lt;/p&gt;</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:richText</componentName>
                 <identifier>flexipage_richText2</identifier>
diff --git a/force-app/main/default/flexipages/smoke-16-template-recordHomeTemplateDesktop.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-16-template-recordHomeTemplateDesktop.flexipage-meta.xml
index d6b0e13..3d7bda1 100644
--- a/force-app/main/default/flexipages/smoke-16-template-recordHomeTemplateDesktop.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-16-template-recordHomeTemplateDesktop.flexipage-meta.xml
@@ -15,10 +15,6 @@
                 <identifier>runtime_sales_pathassistant_pathAssistant</identifier>
             </componentInstance>
         </itemInstances>
-        <name>header</name>
-        <type>Region</type>
-    </flexiPageRegions>
-    <flexiPageRegions>
         <itemInstances>
             <componentInstance>
                 <componentInstanceProperties>
@@ -27,26 +23,34 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>richTextValue</name>
-                    <value>&lt;p&gt;Hello, world!&lt;/p&gt;</value>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:richText</componentName>
-                <identifier>flexipage_richText</identifier>
+                <identifier>flexipage_richText4</identifier>
             </componentInstance>
         </itemInstances>
-        <name>main</name>
+        <name>header</name>
         <type>Region</type>
     </flexiPageRegions>
     <flexiPageRegions>
         <itemInstances>
             <componentInstance>
                 <componentInstanceProperties>
-                    <name>showLegacyActivityComposer</name>
-                    <value>false</value>
+                    <name>decorate</name>
+                    <value>true</value>
                 </componentInstanceProperties>
-                <componentName>runtime_sales_activities:activityPanel</componentName>
-                <identifier>runtime_sales_activities_activityPanel</identifier>
+                <componentInstanceProperties>
+                    <name>richTextValue</name>
+                    <value>&lt;p&gt;Hello again, world!&lt;/p&gt;</value>
+                </componentInstanceProperties>
+                <componentName>flexipage:richText</componentName>
+                <identifier>flexipage_richText</identifier>
             </componentInstance>
         </itemInstances>
+        <name>main</name>
+        <type>Region</type>
+    </flexiPageRegions>
+    <flexiPageRegions>
         <name>sidebar</name>
         <type>Region</type>
     </flexiPageRegions>
diff --git a/force-app/main/default/flexipages/smoke-17-template-recordHomeThreeColHeaderTemplateDesktop.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-17-template-recordHomeThreeColHeaderTemplateDesktop.flexipage-meta.xml
index a4d9008..bcf5cb3 100644
--- a/force-app/main/default/flexipages/smoke-17-template-recordHomeThreeColHeaderTemplateDesktop.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-17-template-recordHomeThreeColHeaderTemplateDesktop.flexipage-meta.xml
@@ -11,6 +11,20 @@
                 <identifier>runtime_sales_merge_mergeCandidatesPreviewCard</identifier>
             </componentInstance>
         </itemInstances>
+        <itemInstances>
+            <componentInstance>
+                <componentInstanceProperties>
+                    <name>decorate</name>
+                    <value>true</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>richTextValue</name>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
+                </componentInstanceProperties>
+                <componentName>flexipage:richText</componentName>
+                <identifier>flexipage_richText4</identifier>
+            </componentInstance>
+        </itemInstances>
         <name>header</name>
         <type>Region</type>
     </flexiPageRegions>
@@ -29,7 +43,7 @@
             <componentInstance>
                 <componentInstanceProperties>
                     <name>showLegacyActivityComposer</name>
-                    <value>false</value>
+                    <value>true</value>
                 </componentInstanceProperties>
                 <componentName>runtime_sales_activities:activityPanel</componentName>
                 <identifier>runtime_sales_activities_activityPanel</identifier>
@@ -39,12 +53,6 @@
         <type>Region</type>
     </flexiPageRegions>
     <flexiPageRegions>
-        <itemInstances>
-            <componentInstance>
-                <componentName>force:detailPanel</componentName>
-                <identifier>force_detailPanel</identifier>
-            </componentInstance>
-        </itemInstances>
         <name>rightsidebar</name>
         <type>Region</type>
     </flexiPageRegions>
diff --git a/force-app/main/default/flexipages/smoke-18-template-recordHomeTwoColEqualHeaderTemplateDesktop.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-18-template-recordHomeTwoColEqualHeaderTemplateDesktop.flexipage-meta.xml
index 7c61a55..8df3724 100644
--- a/force-app/main/default/flexipages/smoke-18-template-recordHomeTwoColEqualHeaderTemplateDesktop.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-18-template-recordHomeTwoColEqualHeaderTemplateDesktop.flexipage-meta.xml
@@ -11,16 +11,24 @@
                 <identifier>industries_service_excellence_actionLauncher</identifier>
             </componentInstance>
         </itemInstances>
-        <name>header</name>
-        <type>Region</type>
-    </flexiPageRegions>
-    <flexiPageRegions>
         <itemInstances>
             <componentInstance>
-                <componentName>runtime_approvals:approvalTrace</componentName>
-                <identifier>runtime_approvals_approvalTrace</identifier>
+                <componentInstanceProperties>
+                    <name>decorate</name>
+                    <value>true</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>richTextValue</name>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
+                </componentInstanceProperties>
+                <componentName>flexipage:richText</componentName>
+                <identifier>flexipage_richText4</identifier>
             </componentInstance>
         </itemInstances>
+        <name>header</name>
+        <type>Region</type>
+    </flexiPageRegions>
+    <flexiPageRegions>
         <name>leftcol</name>
         <type>Region</type>
     </flexiPageRegions>
@@ -81,7 +89,7 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>allowMultipleSectionsOpen</name>
-                    <value>false</value>
+                    <value>true</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:accordion</componentName>
                 <identifier>flexipage_accordion</identifier>
diff --git a/force-app/main/default/flexipages/smoke-19-template-recordHomeWithSubheaderLeftSidebarTemplateDesktop.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-19-template-recordHomeWithSubheaderLeftSidebarTemplateDesktop.flexipage-meta.xml
index 5b12d45..0a10d17 100644
--- a/force-app/main/default/flexipages/smoke-19-template-recordHomeWithSubheaderLeftSidebarTemplateDesktop.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-19-template-recordHomeWithSubheaderLeftSidebarTemplateDesktop.flexipage-meta.xml
@@ -11,16 +11,24 @@
                 <identifier>runtime_sales_activities_activityPanel</identifier>
             </componentInstance>
         </itemInstances>
-        <name>header</name>
-        <type>Region</type>
-    </flexiPageRegions>
-    <flexiPageRegions>
         <itemInstances>
             <componentInstance>
-                <componentName>forceChatter:recordFeedContainer</componentName>
-                <identifier>forceChatter_recordFeedContainer</identifier>
+                <componentInstanceProperties>
+                    <name>decorate</name>
+                    <value>true</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>richTextValue</name>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
+                </componentInstanceProperties>
+                <componentName>flexipage:richText</componentName>
+                <identifier>flexipage_richText4</identifier>
             </componentInstance>
         </itemInstances>
+        <name>header</name>
+        <type>Region</type>
+    </flexiPageRegions>
+    <flexiPageRegions>
         <name>subheader</name>
         <type>Region</type>
     </flexiPageRegions>
@@ -33,7 +41,7 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>richTextValue</name>
-                    <value>&lt;p&gt;left sidebar&lt;/p&gt;</value>
+                    <value>&lt;p&gt;left sidebar, revised&lt;/p&gt;</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:richText</componentName>
                 <identifier>flexipage_richText</identifier>
diff --git a/force-app/main/default/flexipages/smoke-20-template-recordHomeWithSubheaderTemplateDesktop.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-20-template-recordHomeWithSubheaderTemplateDesktop.flexipage-meta.xml
index fdc1bc0..a8982fb 100644
--- a/force-app/main/default/flexipages/smoke-20-template-recordHomeWithSubheaderTemplateDesktop.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-20-template-recordHomeWithSubheaderTemplateDesktop.flexipage-meta.xml
@@ -11,16 +11,24 @@
                 <identifier>flexipage_richText2</identifier>
             </componentInstance>
         </itemInstances>
-        <name>header</name>
-        <type>Region</type>
-    </flexiPageRegions>
-    <flexiPageRegions>
         <itemInstances>
             <componentInstance>
-                <componentName>force:detailPanel</componentName>
-                <identifier>force_detailPanel</identifier>
+                <componentInstanceProperties>
+                    <name>decorate</name>
+                    <value>true</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>richTextValue</name>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
+                </componentInstanceProperties>
+                <componentName>flexipage:richText</componentName>
+                <identifier>flexipage_richText4</identifier>
             </componentInstance>
         </itemInstances>
+        <name>header</name>
+        <type>Region</type>
+    </flexiPageRegions>
+    <flexiPageRegions>
         <name>subheader</name>
         <type>Region</type>
     </flexiPageRegions>
@@ -37,7 +45,7 @@
                 </componentInstanceProperties>
                 <componentInstanceProperties>
                     <name>richTextValue</name>
-                    <value>&lt;p&gt;right sidebar&lt;/p&gt;</value>
+                    <value>&lt;p&gt;right sidebar, revised&lt;/p&gt;</value>
                 </componentInstanceProperties>
                 <componentName>flexipage:richText</componentName>
                 <identifier>flexipage_richText</identifier>
diff --git a/force-app/main/default/flexipages/smoke-21-template-recordPrintableViewTemplate.flexipage-meta.xml b/force-app/main/default/flexipages/smoke-21-template-recordPrintableViewTemplate.flexipage-meta.xml
index eff02d6..5c6f9d6 100644
--- a/force-app/main/default/flexipages/smoke-21-template-recordPrintableViewTemplate.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/smoke-21-template-recordPrintableViewTemplate.flexipage-meta.xml
@@ -5,12 +5,26 @@
             <componentInstance>
                 <componentInstanceProperties>
                     <name>showLegacyActivityComposer</name>
-                    <value>false</value>
+                    <value>true</value>
                 </componentInstanceProperties>
                 <componentName>runtime_sales_activities:activityPanel</componentName>
                 <identifier>runtime_sales_activities_activityPanel</identifier>
             </componentInstance>
         </itemInstances>
+        <itemInstances>
+            <componentInstance>
+                <componentInstanceProperties>
+                    <name>decorate</name>
+                    <value>true</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>richTextValue</name>
+                    <value>&lt;p&gt;Added component&lt;/p&gt;</value>
+                </componentInstanceProperties>
+                <componentName>flexipage:richText</componentName>
+                <identifier>flexipage_richText4</identifier>
+            </componentInstance>
+        </itemInstances>
         <name>header</name>
         <type>Region</type>
     </flexiPageRegions>
@@ -25,12 +39,6 @@
         <type>Region</type>
     </flexiPageRegions>
     <flexiPageRegions>
-        <itemInstances>
-            <componentInstance>
-                <componentName>devops_testing:testSuiteExecutionOverviewLayout</componentName>
-                <identifier>devops_testing_testSuiteExecutionOverviewLayout</identifier>
-            </componentInstance>
-        </itemInstances>
         <name>footer</name>
         <type>Region</type>
     </flexiPageRegions>
diff --git a/force-app/main/default/flows/smoke-01-add_node.flow-meta.xml b/force-app/main/default/flows/smoke-01-add_node.flow-meta.xml
index 2e9fb29..46fb037 100644
--- a/force-app/main/default/flows/smoke-01-add_node.flow-meta.xml
+++ b/force-app/main/default/flows/smoke-01-add_node.flow-meta.xml
@@ -2,6 +2,25 @@
 <Flow xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>66.0</apiVersion>
     <areMetricsLoggedToDataCloud>false</areMetricsLoggedToDataCloud>
+    <decisions>
+        <name>Includes_Jawn</name>
+        <label>Includes Jawn</label>
+        <locationX>0</locationX>
+        <locationY>0</locationY>
+        <defaultConnectorLabel>Default Outcome</defaultConnectorLabel>
+        <rules>
+            <name>Yes</name>
+            <conditionLogic>and</conditionLogic>
+            <conditions>
+                <leftValueReference>$Record.Name</leftValueReference>
+                <operator>Contains</operator>
+                <rightValue>
+                    <stringValue>&quot;Jawn&quot;</stringValue>
+                </rightValue>
+            </conditions>
+            <label>Yes</label>
+        </rules>
+    </decisions>
     <environments>Default</environments>
     <formulas>
         <name>AddJawnToName</name>
@@ -34,6 +53,9 @@
         <label>Jawnify</label>
         <locationX>0</locationX>
         <locationY>0</locationY>
+        <connector>
+            <targetReference>Includes_Jawn</targetReference>
+        </connector>
         <inputAssignments>
             <field>Name</field>
             <value>
diff --git a/force-app/main/default/flows/smoke-02-add_screen.flow-meta.xml b/force-app/main/default/flows/smoke-02-add_screen.flow-meta.xml
index 33f0a29..6d07d9d 100644
--- a/force-app/main/default/flows/smoke-02-add_screen.flow-meta.xml
+++ b/force-app/main/default/flows/smoke-02-add_screen.flow-meta.xml
@@ -17,11 +17,95 @@
         </value>
     </processMetadataValues>
     <processType>Flow</processType>
+    <screens>
+        <name>Configure_Options</name>
+        <label>Configure Options</label>
+        <locationX>176</locationX>
+        <locationY>287</locationY>
+        <allowBack>true</allowBack>
+        <allowFinish>false</allowFinish>
+        <allowPause>true</allowPause>
+        <connector>
+            <targetReference>Welcome</targetReference>
+        </connector>
+        <fields>
+            <name>Intro</name>
+            <fieldText>&lt;p&gt;Choose how the records should be transferred. &lt;a href=&quot;https://example.com&quot; target=&quot;_blank&quot;&gt;Learn more.&lt;/a&gt;&lt;/p&gt;</fieldText>
+            <fieldType>DisplayText</fieldType>
+        </fields>
+        <fields>
+            <name>Single_Column_Section</name>
+            <fieldText>Account options</fieldText>
+            <fieldType>RegionContainer</fieldType>
+            <fields>
+                <name>Single_Column_Section_Column1</name>
+                <fieldType>Region</fieldType>
+                <fields>
+                    <name>Transfer_Notes</name>
+                    <dataType>Boolean</dataType>
+                    <fieldText>Also transfer Notes and Attachments</fieldText>
+                    <fieldType>InputField</fieldType>
+                    <isRequired>true</isRequired>
+                </fields>
+                <inputParameters>
+                    <name>width</name>
+                    <value>
+                        <stringValue>12</stringValue>
+                    </value>
+                </inputParameters>
+                <isRequired>false</isRequired>
+            </fields>
+            <isRequired>false</isRequired>
+            <regionContainerType>SectionWithHeader</regionContainerType>
+        </fields>
+        <fields>
+            <name>Two_Column_Section</name>
+            <fieldType>RegionContainer</fieldType>
+            <fields>
+                <name>Two_Column_Section_Column1</name>
+                <fieldType>Region</fieldType>
+                <fields>
+                    <name>Keep_Team</name>
+                    <dataType>Boolean</dataType>
+                    <fieldText>Keep the Account Team</fieldText>
+                    <fieldType>InputField</fieldType>
+                    <isRequired>true</isRequired>
+                </fields>
+                <inputParameters>
+                    <name>width</name>
+                    <value>
+                        <stringValue>6</stringValue>
+                    </value>
+                </inputParameters>
+                <isRequired>false</isRequired>
+            </fields>
+            <fields>
+                <name>Two_Column_Section_Column2</name>
+                <fieldType>Region</fieldType>
+                <fields>
+                    <name>Help_Text</name>
+                    <fieldText>&lt;p&gt;If unchecked, the Account Team is removed.&lt;/p&gt;</fieldText>
+                    <fieldType>DisplayText</fieldType>
+                </fields>
+                <inputParameters>
+                    <name>width</name>
+                    <value>
+                        <stringValue>6</stringValue>
+                    </value>
+                </inputParameters>
+                <isRequired>false</isRequired>
+            </fields>
+            <isRequired>false</isRequired>
+            <regionContainerType>SectionWithoutHeader</regionContainerType>
+        </fields>
+        <showFooter>true</showFooter>
+        <showHeader>true</showHeader>
+    </screens>
     <screens>
         <name>Welcome</name>
         <label>Welcome</label>
         <locationX>176</locationX>
-        <locationY>287</locationY>
+        <locationY>431</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>true</allowPause>
@@ -37,7 +121,7 @@
         <locationX>176</locationX>
         <locationY>0</locationY>
         <connector>
-            <targetReference>Welcome</targetReference>
+            <targetReference>Configure_Options</targetReference>
         </connector>
     </start>
     <status>Active</status>
diff --git a/force-app/main/default/flows/smoke-03-bump_api_version.flow-meta.xml b/force-app/main/default/flows/smoke-03-bump_api_version.flow-meta.xml
index e664495..e7edd10 100644
--- a/force-app/main/default/flows/smoke-03-bump_api_version.flow-meta.xml
+++ b/force-app/main/default/flows/smoke-03-bump_api_version.flow-meta.xml
@@ -70,7 +70,8 @@
     <nameSegment>TriggerActionFlowAddError</nameSegment>
     <versionSegment>1</versionSegment>
   </actionCalls>
-  <apiVersion>59.0</apiVersion>
+  <apiVersion>60.0</apiVersion>
+    <runInMode>SystemModeWithoutSharing</runInMode>
   <assignments>
     <name>Populate_Tag</name>
     <label>Populate Tag</label>
diff --git a/force-app/main/default/flows/smoke-04-deactivate_flow.flow-meta.xml b/force-app/main/default/flows/smoke-04-deactivate_flow.flow-meta.xml
index ef49cab..1c528cf 100644
--- a/force-app/main/default/flows/smoke-04-deactivate_flow.flow-meta.xml
+++ b/force-app/main/default/flows/smoke-04-deactivate_flow.flow-meta.xml
@@ -208,7 +208,7 @@
       <targetReference>Get_Aurora_Tag_Definition</targetReference>
     </connector>
   </start>
-  <status>Active</status>
+  <status>Draft</status>
   <variables>
     <name>record</name>
     <dataType>SObject</dataType>
diff --git a/force-app/main/default/flows/smoke-05-delete_node.flow-meta.xml b/force-app/main/default/flows/smoke-05-delete_node.flow-meta.xml
index 2b5d16b..b93a686 100644
--- a/force-app/main/default/flows/smoke-05-delete_node.flow-meta.xml
+++ b/force-app/main/default/flows/smoke-05-delete_node.flow-meta.xml
@@ -17,32 +17,11 @@
         </value>
     </processMetadataValues>
     <processType>Flow</processType>
-    <recordLookups>
-        <name>Get_Accounts</name>
-        <label>Get Accounts</label>
-        <locationX>176</locationX>
-        <locationY>134</locationY>
-        <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
-        <connector>
-            <targetReference>Show_Result</targetReference>
-        </connector>
-        <filterLogic>and</filterLogic>
-        <filters>
-            <field>Name</field>
-            <operator>NotEqualTo</operator>
-            <value>
-                <stringValue>Test Account</stringValue>
-            </value>
-        </filters>
-        <getFirstRecordOnly>true</getFirstRecordOnly>
-        <object>Account</object>
-        <storeOutputAutomatically>true</storeOutputAutomatically>
-    </recordLookups>
     <screens>
         <name>Show_Result</name>
         <label>Show Result</label>
         <locationX>176</locationX>
-        <locationY>287</locationY>
+        <locationY>134</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>true</allowPause>
@@ -58,7 +37,7 @@
         <locationX>176</locationX>
         <locationY>0</locationY>
         <connector>
-            <targetReference>Get_Accounts</targetReference>
+            <targetReference>Show_Result</targetReference>
         </connector>
     </start>
     <status>Active</status>
diff --git a/force-app/main/default/flows/smoke-06-fault_path.flow-meta.xml b/force-app/main/default/flows/smoke-06-fault_path.flow-meta.xml
index 2ad0a81..e6f3f1f 100644
--- a/force-app/main/default/flows/smoke-06-fault_path.flow-meta.xml
+++ b/force-app/main/default/flows/smoke-06-fault_path.flow-meta.xml
@@ -22,6 +22,16 @@
             </value>
         </assignmentItems>
     </assignments>
+    <customErrors>
+        <name>Error_on_Get_Children</name>
+        <label>Error on Get Children</label>
+        <locationX>0</locationX>
+        <locationY>0</locationY>
+        <customErrorMessages>
+            <errorMessage>{!ErrorMessage}</errorMessage>
+            <isFieldError>false</isFieldError>
+        </customErrorMessages>
+    </customErrors>
     <decisions>
         <name>Includes_Jawn</name>
         <label>Includes Jawn</label>
@@ -41,6 +51,13 @@
                     <stringValue>&quot;Jawn&quot;</stringValue>
                 </rightValue>
             </conditions>
+            <conditions>
+                <leftValueReference>$Record.CreatedById</leftValueReference>
+                <operator>IsNull</operator>
+                <rightValue>
+                    <booleanValue>false</booleanValue>
+                </rightValue>
+            </conditions>
             <label>Yes</label>
         </rules>
     </decisions>
@@ -80,6 +97,9 @@
         <connector>
             <targetReference>Jawnify</targetReference>
         </connector>
+        <faultConnector>
+            <targetReference>Error_on_Get_Children</targetReference>
+        </faultConnector>
         <filterLogic>and</filterLogic>
         <filters>
             <field>AccountId</field>
@@ -119,4 +139,9 @@
         <triggerType>RecordBeforeSave</triggerType>
     </start>
     <status>Draft</status>
+    <textTemplates>
+        <name>ErrorMessage</name>
+        <isViewedAsPlainText>false</isViewedAsPlainText>
+        <text>&lt;p&gt;ERROR! ERROR! ERROR!&lt;/p&gt;</text>
+    </textTemplates>
 </Flow>
diff --git a/force-app/main/default/flows/smoke-07-modify_assignment.flow-meta.xml b/force-app/main/default/flows/smoke-07-modify_assignment.flow-meta.xml
index eb0f607..7633255 100644
--- a/force-app/main/default/flows/smoke-07-modify_assignment.flow-meta.xml
+++ b/force-app/main/default/flows/smoke-07-modify_assignment.flow-meta.xml
@@ -14,6 +14,13 @@
                 <elementReference>AddJawnToName</elementReference>
             </value>
         </assignmentItems>
+        <assignmentItems>
+            <assignToReference>$Record.Description</assignToReference>
+            <operator>Add</operator>
+            <value>
+                <elementReference>AddJawnToName</elementReference>
+            </value>
+        </assignmentItems>
     </assignments>
     <decisions>
         <name>Includes_Jawn</name>
diff --git a/force-app/main/default/flows/smoke-08-modify_decision.flow-meta.xml b/force-app/main/default/flows/smoke-08-modify_decision.flow-meta.xml
index b6792aa..3365ccb 100644
--- a/force-app/main/default/flows/smoke-08-modify_decision.flow-meta.xml
+++ b/force-app/main/default/flows/smoke-08-modify_decision.flow-meta.xml
@@ -51,13 +51,6 @@
                     <stringValue>&quot;Jawn&quot;</stringValue>
                 </rightValue>
             </conditions>
-            <conditions>
-                <leftValueReference>$Record.CreatedById</leftValueReference>
-                <operator>IsNull</operator>
-                <rightValue>
-                    <booleanValue>false</booleanValue>
-                </rightValue>
-            </conditions>
             <label>Yes</label>
         </rules>
     </decisions>
diff --git a/force-app/main/default/flows/smoke-09-noop_save.flow-meta.xml b/force-app/main/default/flows/smoke-09-noop_save.flow-meta.xml
index 9f19d8f..5874495 100644
--- a/force-app/main/default/flows/smoke-09-noop_save.flow-meta.xml
+++ b/force-app/main/default/flows/smoke-09-noop_save.flow-meta.xml
@@ -32,8 +32,8 @@
     <recordUpdates>
         <name>Jawnify</name>
         <label>Jawnify</label>
-        <locationX>0</locationX>
-        <locationY>0</locationY>
+        <locationX>170</locationX>
+        <locationY>642</locationY>
         <inputAssignments>
             <field>Name</field>
             <value>
@@ -43,8 +43,8 @@
         <inputReference>$Record</inputReference>
     </recordUpdates>
     <start>
-        <locationX>0</locationX>
-        <locationY>0</locationY>
+        <locationX>330</locationX>
+        <locationY>48</locationY>
         <connector>
             <targetReference>Jawnify</targetReference>
         </connector>
diff --git a/force-app/main/default/flows/smoke-10-rewire_connector.flow-meta.xml b/force-app/main/default/flows/smoke-10-rewire_connector.flow-meta.xml
index 97124b2..a9479b3 100644
--- a/force-app/main/default/flows/smoke-10-rewire_connector.flow-meta.xml
+++ b/force-app/main/default/flows/smoke-10-rewire_connector.flow-meta.xml
@@ -28,7 +28,7 @@
         <locationX>0</locationX>
         <locationY>0</locationY>
         <defaultConnector>
-            <targetReference>Get_Children</targetReference>
+            <targetReference>Jawn_that_Jawn</targetReference>
         </defaultConnector>
         <defaultConnectorLabel>No</defaultConnectorLabel>
         <rules>
@@ -78,7 +78,7 @@
         <locationY>0</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
-            <targetReference>Jawn_that_Jawn</targetReference>
+            <targetReference>Jawnify</targetReference>
         </connector>
         <filterLogic>and</filterLogic>
         <filters>
@@ -112,7 +112,7 @@
         <locationX>0</locationX>
         <locationY>0</locationY>
         <connector>
-            <targetReference>Jawnify</targetReference>
+            <targetReference>Get_Children</targetReference>
         </connector>
         <object>Account</object>
         <recordTriggerType>CreateAndUpdate</recordTriggerType>