diff --git a/MOT Capture Process Simulation/@MOTSimulator/setInitialConditions.m b/MOT Capture Process Simulation/@MOTSimulator/setInitialConditions.m
index 11cb451..c4e916d 100644
--- a/MOT Capture Process Simulation/@MOTSimulator/setInitialConditions.m	
+++ b/MOT Capture Process Simulation/@MOTSimulator/setInitialConditions.m	
@@ -4,27 +4,27 @@ function setInitialConditions(this, varargin)
     p.KeepUnmatched = true;
     addParameter(p, 'NumberOfAtoms',        5000,...
             @(x) assert(isnumeric(x) && isscalar(x) && (x > 0)));
-    addParameter(p, 'BluePower',          200e-3,...
+    addParameter(p, 'BluePower',       this.TotalPower,...
                 @(x) assert(isnumeric(x) && isscalar(x) && (x > 0)));  
-    addParameter(p, 'BlueDetuning',        -1.5*Helper.PhysicsConstants.BlueLinewidth,...
+    addParameter(p, 'BlueDetuning',        -1.39*Helper.PhysicsConstants.BlueLinewidth,...
                 @(x) assert(isnumeric(x) && isscalar(x)));  
-    addParameter(p, 'BlueBeamWaist',       10e-3,...
+    addParameter(p, 'BlueBeamWaist',       16.6667e-3,...
                 @(x) assert(isnumeric(x) && isscalar(x) && (x > 0)));  
-    addParameter(p, 'SidebandPower',      200e-3,...
+    addParameter(p, 'SidebandPower', 0.5*this.TotalPower,...
                 @(x) assert(isnumeric(x) && isscalar(x) && (x > 0)));  
-    addParameter(p, 'SidebandDetuning',        0,...
+    addParameter(p, 'SidebandDetuning',    -4.5*Helper.PhysicsConstants.BlueLinewidth,...
                 @(x) assert(isnumeric(x) && isscalar(x)));
-    addParameter(p, 'SidebandBeamWaist',   12e-3,...
+    addParameter(p, 'SidebandBeamWaist',   15e-3,...
                 @(x) assert(isnumeric(x) && isscalar(x) && (x > 0)));  
-    addParameter(p, 'PushBeamPower',       10e-3,...
+    addParameter(p, 'PushBeamPower',        5e-3,...
                 @(x) assert(isnumeric(x) && isscalar(x) && (x > 0)));  
-    addParameter(p, 'PushBeamDetuning',        0,...
+    addParameter(p, 'PushBeamDetuning',     -5*Helper.PhysicsConstants.OrangeLinewidth,...
                 @(x) assert(isnumeric(x) && isscalar(x)));  
-    addParameter(p, 'PushBeamWaist',     0.81e-3,...
+    addParameter(p, 'PushBeamWaist',       0.5e-3,...
                 @(x) assert(isnumeric(x) && isscalar(x) && (x > 0)));  
     addParameter(p, 'OrangePower',         70e-3,...
                 @(x) assert(isnumeric(x) && isscalar(x) && (x > 0)));  
-    addParameter(p, 'OrangeDetuning',      12e-3,...
+    addParameter(p, 'OrangeDetuning',      -1*Helper.PhysicsConstants.OrangeLinewidth,...
                 @(x) assert(isnumeric(x) && isscalar(x)));  
     addParameter(p, 'OrangeBeamWaist',     12e-3,...
                 @(x) assert(isnumeric(x) && isscalar(x) && (x > 0)));  
@@ -56,24 +56,20 @@ function setInitialConditions(this, varargin)
     this.ZeemanSlowerBeamDetuning     = p.Results.ZeemanSlowerBeamDetuning;
     this.ZeemanSlowerBeamWaist        = p.Results.ZeemanSlowerBeamWaist;     
     this.MagneticGradient             = p.Results.MagneticGradient;     
-    
     %% Set general parameters according to simulation mode
     switch this.SimulationMode
         case "2D"
             this.CoolingBeamPower      = this.BluePower;
             this.CoolingBeamWaist      = this.BlueBeamWaist;
             this.CoolingBeamLinewidth  = Helper.PhysicsConstants.BlueLinewidth;
-            this.CoolingBeamWaveVector = this.BlueWaveVector;
+            this.CoolingBeamWaveNumber = this.BlueWaveNumber;
             this.CoolingBeamDetuning   = this.BlueDetuning;
             this.CoolingBeamRadius     = this.BlueBeamRadius;
             this.CoolingBeamWaist      = this.BlueBeamWaist;
             this.CoolingBeamSaturationIntensity = this.BlueSaturationIntensity;
             this.SidebandBeamRadius    = this.BlueBeamRadius;
             this.SidebandBeamSaturationIntensity = this.BlueSaturationIntensity;
-            this.PushBeamLinewidth     = Helper.PhysicsConstants.OrangeLinewidth;
-            this.PushBeamWaveVector    = this.OrangeWaveVector;
             this.PushBeamDetuning      = this.OrangeDetuning;
-            this.PushBeamSaturationIntensity = this.OrangeSaturationIntensity;
             this.LandegFactor          = Helper.PhysicsConstants.BlueLandegFactor;
             this.MagneticSubLevel      = 1;
         case "3D"