diff --git a/gm_soc_rfsoc_top_sw.slx b/gm_soc_rfsoc_top_sw.slx
index 4247733..4322fde 100644
Binary files a/gm_soc_rfsoc_top_sw.slx and b/gm_soc_rfsoc_top_sw.slx differ
diff --git a/referencedmodels/soc_rfsoc_fpga.slx b/referencedmodels/soc_rfsoc_fpga.slx
index dc7cb64..6449d1c 100644
Binary files a/referencedmodels/soc_rfsoc_fpga.slx and b/referencedmodels/soc_rfsoc_fpga.slx differ
diff --git a/referencedmodels/soc_rfsoc_proc.slx b/referencedmodels/soc_rfsoc_proc.slx
index 81ca875..3b824b7 100644
Binary files a/referencedmodels/soc_rfsoc_proc.slx and b/referencedmodels/soc_rfsoc_proc.slx differ
diff --git a/soc_rfsoc_top.slx b/soc_rfsoc_top.slx
index bfca356..b7ef9a6 100644
Binary files a/soc_rfsoc_top.slx and b/soc_rfsoc_top.slx differ
diff --git a/utilities/soc_rfsoc_init.m b/utilities/soc_rfsoc_init.m
index a05fea8..3f4f56c 100644
--- a/utilities/soc_rfsoc_init.m
+++ b/utilities/soc_rfsoc_init.m
@@ -42,20 +42,24 @@ pulseT = 10e-6;
 %CwMode = false;
 
 % Counter mode (bypass pulse and CW generation)
-CounterMode = true;
+%CounterMode = true;
 
 % Output gain
 pulseGenGain = 1;
 
-%% Software parameters
+%% Simulation/External Mode parameters (conditional)
+bd = bdroot; % Retrive which model is calling this function
 
-% Signal generator update rate
-TsSW = 0.5;
-
-%% Simulation parameters
-
-% Sim run time
-%stoptime = TsFPGA*(9 + 1*348 + 1 + 2*128 + 1); %10*TsSW; %TsFPGA*(1*128+348)
+switch bd
+    case 'soc_rfsoc_top'
+        TsSW = 0.0005; % Signal generator and capture update rate
+        StopTime = 0.0025; % Simulation total time
+    case 'gm_soc_rfsoc_top_sw'
+        TsSW = 0.5;
+        StopTime = 10;
+    otherwise
+        error('rfsoc_init: InvalidModel (%s not supported).', bd);
+end
 
 %% Channelizer parameters