diff --git a/src/Extensions/BehaviorVisualizer.bonsai b/src/Extensions/BehaviorVisualizer.bonsai
index 0e98327..5a88dd0 100644
--- a/src/Extensions/BehaviorVisualizer.bonsai
+++ b/src/Extensions/BehaviorVisualizer.bonsai
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<WorkflowBuilder Version="2.9.0"
+<WorkflowBuilder Version="2.9.1"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  xmlns:rx="clr-namespace:Bonsai.Reactive;assembly=Bonsai.Core"
                  xmlns:imgui="clr-namespace:Bonsai.ImGui;assembly=Bonsai.ImGui"
@@ -239,7 +239,7 @@
               <scr:Expression>new(it.Item1 as LickLeft, it.Item2)</scr:Expression>
             </Expression>
             <Expression xsi:type="imviz:RollingBufferBuilder">
-              <imviz:Capacity>1000</imviz:Capacity>
+              <imviz:Capacity>10000</imviz:Capacity>
               <imviz:IndexSelector>Item2</imviz:IndexSelector>
               <imviz:ValueSelector>LickLeft</imviz:ValueSelector>
             </Expression>
@@ -289,7 +289,7 @@
               <scr:Expression>new(it.Item1 as LickRight, it.Item2)</scr:Expression>
             </Expression>
             <Expression xsi:type="imviz:RollingBufferBuilder">
-              <imviz:Capacity>1000</imviz:Capacity>
+              <imviz:Capacity>10000</imviz:Capacity>
               <imviz:IndexSelector>Item2</imviz:IndexSelector>
               <imviz:ValueSelector>LickRight</imviz:ValueSelector>
             </Expression>
@@ -418,7 +418,7 @@
               <scr:Expression>new(it.Seconds, it.Value as Choice)</scr:Expression>
             </Expression>
             <Expression xsi:type="imviz:RollingBufferBuilder">
-              <imviz:Capacity>1000</imviz:Capacity>
+              <imviz:Capacity>10000</imviz:Capacity>
               <imviz:IndexSelector>Seconds</imviz:IndexSelector>
               <imviz:ValueSelector>Choice</imviz:ValueSelector>
             </Expression>
@@ -510,7 +510,7 @@
               <scr:Expression>new(it.Seconds, it.Value as Choice)</scr:Expression>
             </Expression>
             <Expression xsi:type="imviz:RollingBufferBuilder">
-              <imviz:Capacity>1000</imviz:Capacity>
+              <imviz:Capacity>10000</imviz:Capacity>
               <imviz:IndexSelector>Seconds</imviz:IndexSelector>
               <imviz:ValueSelector>Choice</imviz:ValueSelector>
             </Expression>
diff --git a/src/Extensions/BiasVisualizer.bonsai b/src/Extensions/BiasVisualizer.bonsai
index 0425f86..d1870a3 100644
--- a/src/Extensions/BiasVisualizer.bonsai
+++ b/src/Extensions/BiasVisualizer.bonsai
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<WorkflowBuilder Version="2.9.0"
+<WorkflowBuilder Version="2.9.1"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  xmlns:rx="clr-namespace:Bonsai.Reactive;assembly=Bonsai.Core"
                  xmlns:implot="clr-namespace:Bonsai.ImPlot;assembly=Bonsai.ImPlot"
@@ -34,7 +34,7 @@
               </implot:Size>
               <implot:Flags>NoTitle</implot:Flags>
               <implot:FlagsX>AutoFit</implot:FlagsX>
-              <implot:FlagsY>None</implot:FlagsY>
+              <implot:FlagsY>Invert</implot:FlagsY>
             </Expression>
             <Expression xsi:type="rx:PublishSubject">
               <Name>BiasPlot</Name>
@@ -50,8 +50,8 @@
                   <p1:double>1</p1:double>
                 </p1:TickPositions>
                 <p1:TickLabels>
-                  <p1:string>R</p1:string>
                   <p1:string>L</p1:string>
+                  <p1:string>R</p1:string>
                 </p1:TickLabels>
                 <p1:ImPlotLocationFlags>East</p1:ImPlotLocationFlags>
                 <p1:ImPlotLegendFlags>Outside</p1:ImPlotLegendFlags>
@@ -324,12 +324,6 @@
               <imviz:Visible>true</imviz:Visible>
               <imviz:Flags>None</imviz:Flags>
             </Expression>
-            <Expression xsi:type="SubscribeSubject">
-              <Name>TaskLogicParameters</Name>
-            </Expression>
-            <Expression xsi:type="MemberSelector">
-              <Selector>TrialGenerator</Selector>
-            </Expression>
           </Nodes>
           <Edges>
             <Edge From="0" To="1" Label="Source1" />
@@ -397,7 +391,6 @@
             <Edge From="61" To="62" Label="Source1" />
             <Edge From="62" To="63" Label="Source1" />
             <Edge From="63" To="64" Label="Source1" />
-            <Edge From="65" To="66" Label="Source1" />
           </Edges>
         </Workflow>
       </Expression>
diff --git a/src/Extensions/MetadataVisualizer.bonsai b/src/Extensions/MetadataVisualizer.bonsai
index 64d8e52..45d9842 100644
--- a/src/Extensions/MetadataVisualizer.bonsai
+++ b/src/Extensions/MetadataVisualizer.bonsai
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<WorkflowBuilder Version="2.9.0"
+<WorkflowBuilder Version="2.9.1"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  xmlns:rx="clr-namespace:Bonsai.Reactive;assembly=Bonsai.Core"
                  xmlns:imgui="clr-namespace:Bonsai.ImGui;assembly=Bonsai.ImGui"
@@ -246,6 +246,19 @@
             <Expression xsi:type="imgui:TableNextColumnBuilder">
               <imgui:Visible>true</imgui:Visible>
             </Expression>
+            <Expression xsi:type="SubscribeSubject">
+              <Name>StartExperimentShortcut</Name>
+            </Expression>
+            <Expression xsi:type="Combinator">
+              <Combinator xsi:type="BooleanProperty">
+                <Value>false</Value>
+              </Combinator>
+            </Expression>
+            <Expression xsi:type="PropertyMapping">
+              <PropertyMappings>
+                <Property Name="Enabled" />
+              </PropertyMappings>
+            </Expression>
             <Expression xsi:type="p1:EnableableButtonBuilder">
               <p1:Name>StartButton</p1:Name>
               <p1:Visible>true</p1:Visible>
@@ -323,14 +336,17 @@
             <Edge From="37" To="38" Label="Source2" />
             <Edge From="39" To="40" Label="Source1" />
             <Edge From="40" To="41" Label="Source1" />
-            <Edge From="40" To="46" Label="Source1" />
-            <Edge From="41" To="42" Label="Source1" />
+            <Edge From="40" To="49" Label="Source1" />
+            <Edge From="41" To="45" Label="Source1" />
             <Edge From="42" To="43" Label="Source1" />
-            <Edge From="43" To="45" Label="Source1" />
+            <Edge From="43" To="44" Label="Source1" />
             <Edge From="44" To="45" Label="Source2" />
-            <Edge From="46" To="47" Label="Source1" />
-            <Edge From="47" To="48" Label="Source1" />
-            <Edge From="48" To="49" Label="Source1" />
+            <Edge From="45" To="46" Label="Source1" />
+            <Edge From="46" To="48" Label="Source1" />
+            <Edge From="47" To="48" Label="Source2" />
+            <Edge From="49" To="50" Label="Source1" />
+            <Edge From="50" To="51" Label="Source1" />
+            <Edge From="51" To="52" Label="Source1" />
           </Edges>
         </Workflow>
       </Expression>
diff --git a/src/Extensions/OperationControl.bonsai b/src/Extensions/OperationControl.bonsai
index 67ae506..f8131c6 100644
--- a/src/Extensions/OperationControl.bonsai
+++ b/src/Extensions/OperationControl.bonsai
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<WorkflowBuilder Version="2.9.0"
+<WorkflowBuilder Version="2.9.1"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  xmlns:rx="clr-namespace:Bonsai.Reactive;assembly=Bonsai.Core"
                  xmlns:p1="clr-namespace:AllenNeuralDynamics.LicketySplit;assembly=AllenNeuralDynamics.LicketySplit"
@@ -1079,6 +1079,9 @@
             <Expression xsi:type="Combinator">
               <Combinator xsi:type="rx:Merge" />
             </Expression>
+            <Expression xsi:type="rx:BehaviorSubject">
+              <Name>SpoutDelta</Name>
+            </Expression>
             <Expression xsi:type="rx:Condition">
               <Name>Drop0s</Name>
               <Workflow>
@@ -1139,6 +1142,9 @@
             <Expression xsi:type="rx:BehaviorSubject">
               <Name>ManipulatorBiasTracker</Name>
             </Expression>
+            <Expression xsi:type="SubscribeSubject">
+              <Name>SpoutDelta</Name>
+            </Expression>
             <Expression xsi:type="SubscribeSubject">
               <Name>ManipulatorPosition</Name>
             </Expression>
@@ -1210,18 +1216,19 @@
             <Edge From="34" To="36" Label="Source1" />
             <Edge From="35" To="36" Label="Source2" />
             <Edge From="36" To="37" Label="Source1" />
-            <Edge From="37" To="39" Label="Source1" />
-            <Edge From="38" To="39" Label="Source2" />
-            <Edge From="39" To="40" Label="Source1" />
-            <Edge From="40" To="43" Label="Source1" />
-            <Edge From="41" To="42" Label="Source1" />
-            <Edge From="42" To="43" Label="Source2" />
+            <Edge From="37" To="38" Label="Source1" />
+            <Edge From="38" To="40" Label="Source1" />
+            <Edge From="39" To="40" Label="Source2" />
+            <Edge From="40" To="41" Label="Source1" />
+            <Edge From="42" To="45" Label="Source1" />
             <Edge From="43" To="44" Label="Source1" />
-            <Edge From="44" To="45" Label="Source1" />
+            <Edge From="44" To="45" Label="Source2" />
             <Edge From="45" To="46" Label="Source1" />
             <Edge From="46" To="47" Label="Source1" />
+            <Edge From="47" To="48" Label="Source1" />
             <Edge From="48" To="49" Label="Source1" />
-            <Edge From="49" To="50" Label="Source1" />
+            <Edge From="50" To="51" Label="Source1" />
+            <Edge From="51" To="52" Label="Source1" />
           </Edges>
         </Workflow>
       </Expression>
diff --git a/src/Extensions/Visualizers.bonsai b/src/Extensions/Visualizers.bonsai
index d647128..09dc923 100644
--- a/src/Extensions/Visualizers.bonsai
+++ b/src/Extensions/Visualizers.bonsai
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<WorkflowBuilder Version="2.9.0"
+<WorkflowBuilder Version="2.9.1"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  xmlns:imvizui="clr-namespace:Bonsai.ImGui.Visualizers;assembly=Bonsai.ImGui.Visualizers.Design"
                  xmlns:imgui="clr-namespace:Bonsai.ImGui;assembly=Bonsai.ImGui"
@@ -458,7 +458,7 @@
                         </Expression>
                         <Expression xsi:type="Combinator">
                           <Combinator xsi:type="p4:ManipulatorPosition">
-                            <p4:X>-1</p4:X>
+                            <p4:X>1</p4:X>
                             <p4:Y1>0</p4:Y1>
                             <p4:Y2>0</p4:Y2>
                             <p4:Z>0</p4:Z>
@@ -498,7 +498,7 @@
                         </Expression>
                         <Expression xsi:type="Combinator">
                           <Combinator xsi:type="p4:ManipulatorPosition">
-                            <p4:X>1</p4:X>
+                            <p4:X>-1</p4:X>
                             <p4:Y1>0</p4:Y1>
                             <p4:Y2>0</p4:Y2>
                             <p4:Z>0</p4:Z>
@@ -539,8 +539,8 @@
                         <Expression xsi:type="Combinator">
                           <Combinator xsi:type="p4:ManipulatorPosition">
                             <p4:X>0</p4:X>
-                            <p4:Y1>1</p4:Y1>
-                            <p4:Y2>0</p4:Y2>
+                            <p4:Y1>0</p4:Y1>
+                            <p4:Y2>1</p4:Y2>
                             <p4:Z>0</p4:Z>
                           </Combinator>
                         </Expression>
@@ -579,8 +579,8 @@
                         <Expression xsi:type="Combinator">
                           <Combinator xsi:type="p4:ManipulatorPosition">
                             <p4:X>0</p4:X>
-                            <p4:Y1>0</p4:Y1>
-                            <p4:Y2>1</p4:Y2>
+                            <p4:Y1>1</p4:Y1>
+                            <p4:Y2>0</p4:Y2>
                             <p4:Z>0</p4:Z>
                           </Combinator>
                         </Expression>
@@ -619,8 +619,8 @@
                         <Expression xsi:type="Combinator">
                           <Combinator xsi:type="p4:ManipulatorPosition">
                             <p4:X>0</p4:X>
-                            <p4:Y1>-1</p4:Y1>
-                            <p4:Y2>0</p4:Y2>
+                            <p4:Y1>0</p4:Y1>
+                            <p4:Y2>-1</p4:Y2>
                             <p4:Z>0</p4:Z>
                           </Combinator>
                         </Expression>
@@ -659,8 +659,8 @@
                         <Expression xsi:type="Combinator">
                           <Combinator xsi:type="p4:ManipulatorPosition">
                             <p4:X>0</p4:X>
-                            <p4:Y1>0</p4:Y1>
-                            <p4:Y2>-1</p4:Y2>
+                            <p4:Y1>-1</p4:Y1>
+                            <p4:Y2>0</p4:Y2>
                             <p4:Z>0</p4:Z>
                           </Combinator>
                         </Expression>
@@ -889,11 +889,6 @@
                   <Expression xsi:type="MemberSelector">
                     <Selector>Item2</Selector>
                   </Expression>
-                  <Expression xsi:type="Multiply">
-                    <Operand xsi:type="DoubleProperty">
-                      <Value>-1</Value>
-                    </Operand>
-                  </Expression>
                   <Expression xsi:type="MulticastSubject">
                     <Name>ManualSpoutDelta</Name>
                   </Expression>
@@ -905,7 +900,6 @@
                   <Edge From="2" To="3" Label="Source1" />
                   <Edge From="3" To="4" Label="Source1" />
                   <Edge From="4" To="5" Label="Source1" />
-                  <Edge From="5" To="6" Label="Source1" />
                 </Edges>
               </Workflow>
             </Expression>
@@ -928,6 +922,11 @@
                   <Expression xsi:type="MemberSelector">
                     <Selector>Item2</Selector>
                   </Expression>
+                  <Expression xsi:type="Multiply">
+                    <Operand xsi:type="DoubleProperty">
+                      <Value>-1</Value>
+                    </Operand>
+                  </Expression>
                   <Expression xsi:type="MulticastSubject">
                     <Name>ManualSpoutDelta</Name>
                   </Expression>
@@ -939,6 +938,7 @@
                   <Edge From="2" To="3" Label="Source1" />
                   <Edge From="3" To="4" Label="Source1" />
                   <Edge From="4" To="5" Label="Source1" />
+                  <Edge From="5" To="6" Label="Source1" />
                 </Edges>
               </Workflow>
             </Expression>
@@ -1900,25 +1900,6 @@
           </Edges>
         </Workflow>
       </Expression>
-      <Expression xsi:type="IncludeWorkflow" Path="Extensions\BehaviorVisualizer.bonsai">
-        <PlotName>Behavior1</PlotName>
-        <LickLeftSubject>LickLeft</LickLeftSubject>
-        <LickRightSubject>LickRight</LickRightSubject>
-        <TrialSubject>TimedTrial</TrialSubject>
-        <FrameSubject>Behavior</FrameSubject>
-        <AutoRewardRightSubject>AutoRewardRight</AutoRewardRightSubject>
-        <AutoRewardLeftSubject>AutoRewardLeft</AutoRewardLeftSubject>
-      </Expression>
-      <Expression xsi:type="IncludeWorkflow" Path="Extensions\BiasVisualizer.bonsai">
-        <FrameSubject>Bias</FrameSubject>
-        <TimedBias>TrialIndexedBias</TimedBias>
-        <LeftBiasCorrectionSubject>LeftBiasCorrection</LeftBiasCorrectionSubject>
-        <RightBiasCorrectionSubject>RightBiasCorrection</RightBiasCorrectionSubject>
-      </Expression>
-      <Expression xsi:type="Annotation">
-        <Name>PLACEHOLDER</Name>
-        <Text><![CDATA[Placheolder for session information dictionary]]></Text>
-      </Expression>
       <Expression xsi:type="GroupWorkflow">
         <Name>SessionInfo</Name>
         <Workflow>
@@ -1941,6 +1922,43 @@
           </Edges>
         </Workflow>
       </Expression>
+      <Expression xsi:type="rx:Defer">
+        <Name>BehaviorVisualizer</Name>
+        <Workflow>
+          <Nodes>
+            <Expression xsi:type="IncludeWorkflow" Path="Extensions\BehaviorVisualizer.bonsai">
+              <PlotName>Behavior1</PlotName>
+              <LickLeftSubject>LickLeft</LickLeftSubject>
+              <LickRightSubject>LickRight</LickRightSubject>
+              <TrialSubject>TimedTrial</TrialSubject>
+              <FrameSubject>Behavior</FrameSubject>
+              <AutoRewardRightSubject>AutoRewardRight</AutoRewardRightSubject>
+              <AutoRewardLeftSubject>AutoRewardLeft</AutoRewardLeftSubject>
+            </Expression>
+            <Expression xsi:type="WorkflowOutput" />
+          </Nodes>
+          <Edges>
+            <Edge From="0" To="1" Label="Source1" />
+          </Edges>
+        </Workflow>
+      </Expression>
+      <Expression xsi:type="rx:Defer">
+        <Name>BiasVisualizer</Name>
+        <Workflow>
+          <Nodes>
+            <Expression xsi:type="IncludeWorkflow" Path="Extensions\BiasVisualizer.bonsai">
+              <FrameSubject>Bias</FrameSubject>
+              <TimedBias>TrialIndexedBias</TimedBias>
+              <LeftBiasCorrectionSubject>LeftBiasCorrection</LeftBiasCorrectionSubject>
+              <RightBiasCorrectionSubject>RightBiasCorrection</RightBiasCorrectionSubject>
+            </Expression>
+            <Expression xsi:type="WorkflowOutput" />
+          </Nodes>
+          <Edges>
+            <Edge From="0" To="1" Label="Source1" />
+          </Edges>
+        </Workflow>
+      </Expression>
       <Expression xsi:type="SubscribeSubject">
         <Name>Ethogram</Name>
       </Expression>
@@ -2032,13 +2050,13 @@
         <CameraName>BodyCamera</CameraName>
         <MinSaturation>0.1</MinSaturation>
         <MaxSaturation>0.9</MaxSaturation>
-        <FlipState>2</FlipState>
+        <FlipState>1</FlipState>
         <Rotation>0</Rotation>
         <TriggeredCamerasStream>TriggeredCamerasStream</TriggeredCamerasStream>
       </Expression>
       <Expression xsi:type="IncludeWorkflow" Path="Extensions\CameraPreviewVisualizer.bonsai">
         <FrameSubject>Camera</FrameSubject>
-        <CameraName>BodyCamera</CameraName>
+        <CameraName>SideCamera</CameraName>
         <MinSaturation>0.1</MinSaturation>
         <MaxSaturation>0.9</MaxSaturation>
         <FlipState>2</FlipState>
@@ -2054,55 +2072,91 @@
       <Expression xsi:type="Combinator">
         <Combinator xsi:type="rx:WithLatestFrom" />
       </Expression>
-      <Expression xsi:type="IncludeWorkflow" Path="Extensions\MetadataVisualizer.bonsai">
-        <FrameSubject>Metadata</FrameSubject>
-        <StartExperimentSubject>StartExperimentShortcut</StartExperimentSubject>
-        <UiHabituationTimeUpdate>UiHabituationTimeUpdate</UiHabituationTimeUpdate>
+      <Expression xsi:type="rx:Defer">
+        <Name>MetadataVisualizer</Name>
+        <Workflow>
+          <Nodes>
+            <Expression xsi:type="WorkflowInput">
+              <Name>Source1</Name>
+            </Expression>
+            <Expression xsi:type="IncludeWorkflow" Path="Extensions\MetadataVisualizer.bonsai">
+              <FrameSubject>Metadata</FrameSubject>
+              <StartExperimentSubject>StartExperimentShortcut</StartExperimentSubject>
+              <UiHabituationTimeUpdate>UiHabituationTimeUpdate</UiHabituationTimeUpdate>
+            </Expression>
+            <Expression xsi:type="WorkflowOutput" />
+          </Nodes>
+          <Edges>
+            <Edge From="0" To="1" Label="Source1" />
+            <Edge From="1" To="2" Label="Source1" />
+          </Edges>
+        </Workflow>
       </Expression>
-      <Expression xsi:type="IncludeWorkflow" Path="Extensions\PreSessionVisualizer.bonsai">
-        <FrameSubject>PreSession</FrameSubject>
-        <UiKeepLeftOpne>UiKeepLeftOpen</UiKeepLeftOpne>
-        <UiKeepRightOpen>UiKeepRightOpen</UiKeepRightOpen>
-        <UiKeepBothOpen>UiKeepBothOpen</UiKeepBothOpen>
-        <UiDrainLeft>UiDrainLeft</UiDrainLeft>
-        <UiDrainRight>UiDrainRight</UiDrainRight>
-        <UiDrainBoth>UiDrainBoth</UiDrainBoth>
-        <UiManipulatorLeft>UiManipulatorLeft</UiManipulatorLeft>
-        <UiManipulatorForwardLeft>UiManipulatorForwardLeft</UiManipulatorForwardLeft>
-        <UiManipulatorForwardRight>UiManipulatorForwardRight</UiManipulatorForwardRight>
-        <UiManipulatorUp>UiManipulatorUp</UiManipulatorUp>
-        <UiManipulatorRight>UiManipulatorRight</UiManipulatorRight>
-        <UiManipulatorBackLeft>UiManipulatorBackLeft</UiManipulatorBackLeft>
-        <UiManipulatorBackRight>UiManipulatorBackRight</UiManipulatorBackRight>
-        <UiManipulatorDown>UiManipulatorDown</UiManipulatorDown>
-        <UiManipulatorStop>UiManipulatorStop</UiManipulatorStop>
-        <UiManipulatorHome>UiManipulatorHome</UiManipulatorHome>
-        <UiControlManipulator>UiManipulatorInitialize</UiControlManipulator>
-        <DrainLeftComplete>DrainLeftComplete</DrainLeftComplete>
-        <DrainRightComplete>DrainRightComplete</DrainRightComplete>
+      <Expression xsi:type="rx:Defer">
+        <Name>PreSessionVisualizer</Name>
+        <Workflow>
+          <Nodes>
+            <Expression xsi:type="IncludeWorkflow" Path="Extensions\PreSessionVisualizer.bonsai">
+              <FrameSubject>PreSession</FrameSubject>
+              <UiKeepLeftOpne>UiKeepLeftOpen</UiKeepLeftOpne>
+              <UiKeepRightOpen>UiKeepRightOpen</UiKeepRightOpen>
+              <UiKeepBothOpen>UiKeepBothOpen</UiKeepBothOpen>
+              <UiDrainLeft>UiDrainLeft</UiDrainLeft>
+              <UiDrainRight>UiDrainRight</UiDrainRight>
+              <UiDrainBoth>UiDrainBoth</UiDrainBoth>
+              <UiManipulatorLeft>UiManipulatorLeft</UiManipulatorLeft>
+              <UiManipulatorForwardLeft>UiManipulatorForwardLeft</UiManipulatorForwardLeft>
+              <UiManipulatorForwardRight>UiManipulatorForwardRight</UiManipulatorForwardRight>
+              <UiManipulatorUp>UiManipulatorUp</UiManipulatorUp>
+              <UiManipulatorRight>UiManipulatorRight</UiManipulatorRight>
+              <UiManipulatorBackLeft>UiManipulatorBackLeft</UiManipulatorBackLeft>
+              <UiManipulatorBackRight>UiManipulatorBackRight</UiManipulatorBackRight>
+              <UiManipulatorDown>UiManipulatorDown</UiManipulatorDown>
+              <UiManipulatorStop>UiManipulatorStop</UiManipulatorStop>
+              <UiManipulatorHome>UiManipulatorHome</UiManipulatorHome>
+              <UiControlManipulator>UiManipulatorInitialize</UiControlManipulator>
+              <DrainLeftComplete>DrainLeftComplete</DrainLeftComplete>
+              <DrainRightComplete>DrainRightComplete</DrainRightComplete>
+            </Expression>
+            <Expression xsi:type="WorkflowOutput" />
+          </Nodes>
+          <Edges>
+            <Edge From="0" To="1" Label="Source1" />
+          </Edges>
+        </Workflow>
       </Expression>
-      <Expression xsi:type="IncludeWorkflow" Path="Extensions\IntraSessionVisualizer.bonsai">
-        <FrameSubject>IntraSession</FrameSubject>
-        <UiGiveLeft>UiGiveLeft</UiGiveLeft>
-        <UiGiveRight>UiGiveRight</UiGiveRight>
-        <UiMoveLeft>UiMoveLeft</UiMoveLeft>
-        <UiMoveRight>UiMoveRight</UiMoveRight>
-        <StartExperimentSubject>StartExperiment</StartExperimentSubject>
-        <UiCueGiveLeft>UiCueGiveLeft</UiCueGiveLeft>
-        <UiCueGiveRight>UiCueGiveRight</UiCueGiveRight>
-        <SessionMetadataSubject>SessionMetadata</SessionMetadataSubject>
+      <Expression xsi:type="rx:Defer">
+        <Name>IntraSessionVisualizer</Name>
+        <Workflow>
+          <Nodes>
+            <Expression xsi:type="IncludeWorkflow" Path="Extensions\IntraSessionVisualizer.bonsai">
+              <FrameSubject>IntraSession</FrameSubject>
+              <UiGiveLeft>UiGiveLeft</UiGiveLeft>
+              <UiGiveRight>UiGiveRight</UiGiveRight>
+              <UiMoveLeft>UiMoveLeft</UiMoveLeft>
+              <UiMoveRight>UiMoveRight</UiMoveRight>
+              <StartExperimentSubject>StartExperiment</StartExperimentSubject>
+              <UiCueGiveLeft>UiCueGiveLeft</UiCueGiveLeft>
+              <UiCueGiveRight>UiCueGiveRight</UiCueGiveRight>
+              <SessionMetadataSubject>SessionMetadata</SessionMetadataSubject>
+            </Expression>
+            <Expression xsi:type="WorkflowOutput" />
+          </Nodes>
+          <Edges>
+            <Edge From="0" To="1" Label="Source1" />
+          </Edges>
+        </Workflow>
       </Expression>
     </Nodes>
     <Edges>
-      <Edge From="6" To="7" Label="Source1" />
-      <Edge From="8" To="11" Label="Source1" />
-      <Edge From="9" To="10" Label="Source1" />
-      <Edge From="10" To="11" Label="Source2" />
-      <Edge From="12" To="13" Label="Source1" />
-      <Edge From="12" To="14" Label="Source1" />
-      <Edge From="15" To="17" Label="Source1" />
-      <Edge From="16" To="17" Label="Source2" />
-      <Edge From="17" To="18" Label="Source1" />
+      <Edge From="7" To="10" Label="Source1" />
+      <Edge From="8" To="9" Label="Source1" />
+      <Edge From="9" To="10" Label="Source2" />
+      <Edge From="11" To="12" Label="Source1" />
+      <Edge From="11" To="13" Label="Source1" />
+      <Edge From="14" To="16" Label="Source1" />
+      <Edge From="15" To="16" Label="Source2" />
+      <Edge From="16" To="17" Label="Source1" />
     </Edges>
   </Workflow>
 </WorkflowBuilder>
\ No newline at end of file
diff --git a/src/main.bonsai b/src/main.bonsai
index df46f34..42b8a60 100644
--- a/src/main.bonsai
+++ b/src/main.bonsai
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<WorkflowBuilder Version="2.9.0"
+<WorkflowBuilder Version="2.9.1"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  xmlns:p1="clr-namespace:AindDynamicForagingDataSchema;assembly=Extensions"
                  xmlns:rx="clr-namespace:Bonsai.Reactive;assembly=Bonsai.Core"
@@ -492,7 +492,18 @@
         </Combinator>
       </Expression>
       <Expression xsi:type="WorkflowOutput" />
-      <Expression xsi:type="IncludeWorkflow" Path="Extensions\Visualizers.bonsai" />
+      <Expression xsi:type="rx:Defer">
+        <Name>Visualizers</Name>
+        <Workflow>
+          <Nodes>
+            <Expression xsi:type="IncludeWorkflow" Path="Extensions\Visualizers.bonsai" />
+            <Expression xsi:type="WorkflowOutput" />
+          </Nodes>
+          <Edges>
+            <Edge From="0" To="1" Label="Source1" />
+          </Edges>
+        </Workflow>
+      </Expression>
     </Nodes>
     <Edges>
       <Edge From="0" To="1" Label="Source1" />