diff --git a/sbndcode/SBNDPandora/scripts/PandoraSettings_CI_SBND.xml b/sbndcode/SBNDPandora/scripts/PandoraSettings_CI_SBND.xml
index fede0b0e7..6ae26e046 100644
--- a/sbndcode/SBNDPandora/scripts/PandoraSettings_CI_SBND.xml
+++ b/sbndcode/SBNDPandora/scripts/PandoraSettings_CI_SBND.xml
@@ -18,8 +18,16 @@
     <NuSettingsFile>PandoraSettings_Neutrino_SBND.xml</NuSettingsFile>
     <SlicingSettingsFile>PandoraSettings_Slicing_Standard.xml</SlicingSettingsFile>
     <StitchingTools>
-      <tool type = "LArStitchingCosmicRayMerging"><ThreeDStitchingMode>true</ThreeDStitchingMode></tool>
-      <tool type = "LArStitchingCosmicRayMerging"><ThreeDStitchingMode>false</ThreeDStitchingMode></tool>
+      <tool type = "LArStitchingCosmicRayMerging">
+        <ThreeDStitchingMode>true</ThreeDStitchingMode>
+        <MinLongitudinalDisplacementX>-4.0</MinLongitudinalDisplacementX>
+        <LooserMaxTransverseDisplacement>4.0</LooserMaxTransverseDisplacement>
+      </tool>
+      <tool type = "LArStitchingCosmicRayMerging">
+        <ThreeDStitchingMode>false</ThreeDStitchingMode>
+        <MinLongitudinalDisplacementX>-5.0</MinLongitudinalDisplacementX>
+        <LooserMaxTransverseDisplacement>4.0</LooserMaxTransverseDisplacement>
+      </tool>
     </StitchingTools>
     <CosmicRayTaggingTools>
       <tool type = "LArCosmicRayTagging"/>
@@ -39,6 +47,7 @@
     <RecreatedClusterListName>RecreatedClusters</RecreatedClusterListName>
     <RecreatedVertexListName>RecreatedVertices</RecreatedVertexListName>
     <VisualizeOverallRecoStatus>false</VisualizeOverallRecoStatus>
+    <InTimeMaxX0>2.5</InTimeMaxX0>
   </algorithm>
 
   <algorithm type = "LArEventClusterValidation">
diff --git a/sbndcode/SBNDPandora/scripts/PandoraSettings_Master_SBND.xml b/sbndcode/SBNDPandora/scripts/PandoraSettings_Master_SBND.xml
index aefbce4da..38e744285 100644
--- a/sbndcode/SBNDPandora/scripts/PandoraSettings_Master_SBND.xml
+++ b/sbndcode/SBNDPandora/scripts/PandoraSettings_Master_SBND.xml
@@ -26,8 +26,16 @@
     <NuSettingsFile>PandoraSettings_Neutrino_SBND.xml</NuSettingsFile>
     <SlicingSettingsFile>PandoraSettings_Slicing_Standard.xml</SlicingSettingsFile>
     <StitchingTools>
-      <tool type = "LArStitchingCosmicRayMerging"><ThreeDStitchingMode>true</ThreeDStitchingMode></tool>
-      <tool type = "LArStitchingCosmicRayMerging"><ThreeDStitchingMode>false</ThreeDStitchingMode></tool>
+      <tool type = "LArStitchingCosmicRayMerging">
+        <ThreeDStitchingMode>true</ThreeDStitchingMode>
+        <MinLongitudinalDisplacementX>-4.0</MinLongitudinalDisplacementX>
+        <LooserMaxTransverseDisplacement>4.0</LooserMaxTransverseDisplacement>
+      </tool>
+      <tool type = "LArStitchingCosmicRayMerging">
+        <ThreeDStitchingMode>false</ThreeDStitchingMode>
+        <MinLongitudinalDisplacementX>-5.0</MinLongitudinalDisplacementX>
+        <LooserMaxTransverseDisplacement>4.0</LooserMaxTransverseDisplacement>
+      </tool>
     </StitchingTools>
     <CosmicRayTaggingTools>
       <tool type = "LArCosmicRayTagging"/>
@@ -47,6 +55,7 @@
     <RecreatedClusterListName>RecreatedClusters</RecreatedClusterListName>
     <RecreatedVertexListName>RecreatedVertices</RecreatedVertexListName>
     <VisualizeOverallRecoStatus>false</VisualizeOverallRecoStatus>
+    <InTimeMaxX0>2.5</InTimeMaxX0>
   </algorithm>
 
   <algorithm type = "LArVisualMonitoring">
diff --git a/sbndcode/SBNDPandora/scripts/PandoraSettings_Neutrino_SBND.xml b/sbndcode/SBNDPandora/scripts/PandoraSettings_Neutrino_SBND.xml
index 1c177a684..87977f033 100644
--- a/sbndcode/SBNDPandora/scripts/PandoraSettings_Neutrino_SBND.xml
+++ b/sbndcode/SBNDPandora/scripts/PandoraSettings_Neutrino_SBND.xml
@@ -27,7 +27,11 @@
   <algorithm type = "LArTransverseAssociation"/>
   <algorithm type = "LArLongitudinalExtension"/>
   <algorithm type = "LArTransverseExtension"/>
-  <algorithm type = "LArCrossGapsAssociation"/>
+  <algorithm type = "LArCrossGapsAssociation">
+    <GapTolerance>2.5</GapTolerance>
+    <MaxOnClusterDistance>2.0</MaxOnClusterDistance>
+    <SlidingFitWindow>30</SlidingFitWindow>
+  </algorithm>
   <algorithm type = "LArCrossGapsExtension"/>
   <algorithm type = "LArOvershootSplitting"/>
   <algorithm type = "LArBranchSplitting"/>
@@ -49,7 +53,11 @@
   <algorithm type = "LArTransverseAssociation"/>
   <algorithm type = "LArLongitudinalExtension"/>
   <algorithm type = "LArTransverseExtension"/>
-  <algorithm type = "LArCrossGapsAssociation"/>
+  <algorithm type = "LArCrossGapsAssociation">
+    <GapTolerance>2.5</GapTolerance>
+    <MaxOnClusterDistance>2.0</MaxOnClusterDistance>
+    <SlidingFitWindow>30</SlidingFitWindow>
+  </algorithm>
   <algorithm type = "LArCrossGapsExtension"/>
   <algorithm type = "LArOvershootSplitting"/>
   <algorithm type = "LArBranchSplitting"/>
@@ -71,7 +79,11 @@
   <algorithm type = "LArTransverseAssociation"/>
   <algorithm type = "LArLongitudinalExtension"/>
   <algorithm type = "LArTransverseExtension"/>
-  <algorithm type = "LArCrossGapsAssociation"/>
+  <algorithm type = "LArCrossGapsAssociation">
+    <GapTolerance>2.5</GapTolerance>
+    <MaxOnClusterDistance>2.0</MaxOnClusterDistance>
+    <SlidingFitWindow>30</SlidingFitWindow>
+  </algorithm>
   <algorithm type = "LArCrossGapsExtension"/>
   <algorithm type = "LArOvershootSplitting"/>
   <algorithm type = "LArBranchSplitting"/>