diff --git a/.github/workflows/CMake.yml b/.github/workflows/CMake.yml
index f96fb08..5cdf038 100644
--- a/.github/workflows/CMake.yml
+++ b/.github/workflows/CMake.yml
@@ -23,13 +23,13 @@ jobs:
       with:
         cuda: '11.7.0'
         
-    - name: boost install
-      id: boost-install
+    - name: dependencies install
+      id: dependencies-install
       run: sudo apt-get update && sudo apt-get install -yq libboost-all-dev libhdf5-dev libtbb-dev 
       
     - uses: actions/checkout@v3
     
-    - name: echo settings
+    - name: Echo settings
       run: nvcc -V
     
     - run: mkdir ${{github.workspace}}/build   
diff --git a/README.md b/README.md
index 25e3c55..f08452b 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,6 @@ We suggest utilizing the provided Dockerfile, which automates the installation o
 docker build -t spinwalk .
 docker run --gpus all --rm -it --runtime=nvidia spinwalk bash
 ```
-Execute the **spinwalk** command, and you'll encounter the help menu along with the list of available GPU(s) in the output.
 ### CMake
 
 #### Dependencies
diff --git a/config/dwi/dwi_baseline.ini b/config/dwi/dwi_baseline.ini
index d54c084..96a2ca9 100644
--- a/config/dwi/dwi_baseline.ini
+++ b/config/dwi/dwi_baseline.ini
@@ -3,10 +3,10 @@ SEQ_NAME    = dwi_base
 PARENT_CONFIG = ../config_default.ini
 
 [FILES]
-OUTPUT_DIR   = ../../../outputs/dwi/
+OUTPUT_DIR   = ../../../outputs/dwi
 ;PHANTOM[0]  = ../../../phantoms/restricted_diffusion_model_cylinder.h5
-PHANTOM[0]  = ../../../phantoms/restricted_diffusion_model_sphere.h5
-;PHANTOM[1]  = ../../../phantoms/free_diffusion_model.dat
+;PHANTOM[0]  = ../../../phantoms/restricted_diffusion_model_sphere.h5
+PHANTOM[0]  = ../../../phantoms/free_diffusion_model.h5
 
 [TISSUE_PARAMETERS]
 ; m^2/Sec.
@@ -15,38 +15,40 @@ DIFFUSIVITY[1] = 0.6e-9
 ; Probability to diffuse from tissue X to tissue Y. X and Y are taken from the levels in the mask
 P_XY[0] = 1.00 1.00
 P_XY[1] = 1.00 1.00
-; T1 and T2 in seconds
-T1[0] = 10000
-T1[1] = 10000
-T2[0] = 10000
-T2[1] = 10000
+; T1 and T2 in millisecond (float)
+T1[0] = 1000000
+T1[1] = 1000000
+T2[0] = 1000000
+T2[1] = 1000000
 
 [SCAN_PARAMETERS]
-TR = 0.031
-TE[0] = 0.03
+; repetition time in microsecond (integer)
+TR = 70e3
+; echo time in microsecond (integer)
+TE[0] = 60e3
 ; RF Flip angle in degree 
 RF_FA[0] = 90.0
 RF_FA[1] = 180.0
 ; RF Phase in degree. The first RF phase is always 0.0, but can be controlled by PHASE_CYCLING in STEADY_STATE
 RF_PH[0] = 0.0
 RF_PH[1] = 90.0
-; Time (sec) to apply RF. The first RF start time is always 0.0
+; Time to apply RF in microsecond (integer). The first RF start time is always 0.0
 RF_T[0] = 0.0
-RF_T[1] = 0.015
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
+RF_T[1] = 30e3
+; Apply gradient in mT/m for each axis. Gradients are active for one TIME_STEP
 GRADIENT_XYZ[0] = 0.0 0.0 0.0
 GRADIENT_XYZ[1] = 0.0 0.0 0.0
-; Time (sec) to apply gradient.
-GRADIENT_T[0] = 0.001
-GRADIENT_T[1] = 0.029
-
+; Time to apply gradient in micro-second (integer).
+GRADIENT_T[0] = 15e3
+GRADIENT_T[1] = 45e3
+; time intervals per random-walk in micro-second (integer)
 TIME_STEP  = 50
 
 [SIMULATION_PARAMETERS]
 ; use 0 for random seed generation, otherwise use a positive integer to make a reproducible simulation
 SEED = 25
 NUMBER_OF_SPINS = 1e6
-SAMPLE_LENGTH_SCALES[0] = 0.5
+SAMPLE_LENGTH_SCALES[0] = 1.0
 MAX_ITERATIONS = 1e6
 RECORD_TRAJECTORY = 0
 
diff --git a/config/dwi/dwi_x_100.ini b/config/dwi/dwi_x_100.ini
index bb1066a..dccfa0a 100644
--- a/config/dwi/dwi_x_100.ini
+++ b/config/dwi/dwi_x_100.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_100
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 4.46922 0.0 0.0
-GRADIENT_XYZ[1] = 4.46922 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 4317.58990 0.0 0.0
+GRADIENT_XYZ[1] = 4317.58990 0.0 0.0
diff --git a/config/dwi/dwi_x_1000.ini b/config/dwi/dwi_x_1000.ini
index c18e62f..d970859 100644
--- a/config/dwi/dwi_x_1000.ini
+++ b/config/dwi/dwi_x_1000.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_1000
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 14.13291 0.0 0.0
-GRADIENT_XYZ[1] = 14.13291 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 13653.41808 0.0 0.0
+GRADIENT_XYZ[1] = 13653.41808 0.0 0.0
diff --git a/config/dwi/dwi_x_1100.ini b/config/dwi/dwi_x_1100.ini
index 1d2293f..c849659 100644
--- a/config/dwi/dwi_x_1100.ini
+++ b/config/dwi/dwi_x_1100.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_1100
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 14.82272 0.0 0.0
-GRADIENT_XYZ[1] = 14.82272 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 14319.82569 0.0 0.0
+GRADIENT_XYZ[1] = 14319.82569 0.0 0.0
diff --git a/config/dwi/dwi_x_1150.ini b/config/dwi/dwi_x_1150.ini
index 5529394..4689778 100644
--- a/config/dwi/dwi_x_1150.ini
+++ b/config/dwi/dwi_x_1150.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_1150
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
+; Apply gradient in mT/m for each axis. Gradients are active for one TIME_STEP
 GRADIENT_XYZ[0] = 15.15586 0.0 0.0
 GRADIENT_XYZ[1] = 15.15586 0.0 0.0
diff --git a/config/dwi/dwi_x_1200.ini b/config/dwi/dwi_x_1200.ini
index 14a12f6..14bc466 100644
--- a/config/dwi/dwi_x_1200.ini
+++ b/config/dwi/dwi_x_1200.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_1200
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 15.48183 0.0 0.0
-GRADIENT_XYZ[1] = 15.48183 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 14956.57014 0.0 0.0
+GRADIENT_XYZ[1] = 14956.57014 0.0 0.0
diff --git a/config/dwi/dwi_x_1300.ini b/config/dwi/dwi_x_1300.ini
index 4e101e2..8495173 100644
--- a/config/dwi/dwi_x_1300.ini
+++ b/config/dwi/dwi_x_1300.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_1300
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 16.11400 0.0 0.0
-GRADIENT_XYZ[1] = 16.11400 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 15567.29177 0.0 0.0
+GRADIENT_XYZ[1] = 15567.29177 0.0 0.0
diff --git a/config/dwi/dwi_x_1350.ini b/config/dwi/dwi_x_1350.ini
index 6695e8a..7f09cbd 100644
--- a/config/dwi/dwi_x_1350.ini
+++ b/config/dwi/dwi_x_1350.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_1350
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
+; Apply gradient in mT/m for each axis. Gradients are active for one TIME_STEP
 GRADIENT_XYZ[0] = 16.42096 0.0 0.0
 GRADIENT_XYZ[1] = 16.42096 0.0 0.0
diff --git a/config/dwi/dwi_x_1400.ini b/config/dwi/dwi_x_1400.ini
index 6f084d5..6d6e883 100644
--- a/config/dwi/dwi_x_1400.ini
+++ b/config/dwi/dwi_x_1400.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_1400
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 16.72229 0.0 0.0
-GRADIENT_XYZ[1] = 16.72229 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 16154.94214 0.0 0.0
+GRADIENT_XYZ[1] = 16154.94214 0.0 0.0
diff --git a/config/dwi/dwi_x_1500.ini b/config/dwi/dwi_x_1500.ini
index b1d595d..ef45b27 100644
--- a/config/dwi/dwi_x_1500.ini
+++ b/config/dwi/dwi_x_1500.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_1500
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 17.30921 0.0 0.0
-GRADIENT_XYZ[1] = 17.30921 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 16721.95377 0.0 0.0
+GRADIENT_XYZ[1] = 16721.95377 0.0 0.0
diff --git a/config/dwi/dwi_x_1600.ini b/config/dwi/dwi_x_1600.ini
index a6719a3..dd66c37 100644
--- a/config/dwi/dwi_x_1600.ini
+++ b/config/dwi/dwi_x_1600.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_1600
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 17.87688 0.0 0.0
-GRADIENT_XYZ[1] = 17.87688 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 17270.35959 0.0 0.0
+GRADIENT_XYZ[1] = 17270.35959 0.0 0.0
diff --git a/config/dwi/dwi_x_1700.ini b/config/dwi/dwi_x_1700.ini
index 9941ad9..5b98232 100644
--- a/config/dwi/dwi_x_1700.ini
+++ b/config/dwi/dwi_x_1700.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_1700
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 18.42706 0.0 0.0
-GRADIENT_XYZ[1] = 18.42706 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 17801.87920 0.0 0.0
+GRADIENT_XYZ[1] = 17801.87920 0.0 0.0
diff --git a/config/dwi/dwi_x_1750.ini b/config/dwi/dwi_x_1750.ini
index d6e1e70..034a070 100644
--- a/config/dwi/dwi_x_1750.ini
+++ b/config/dwi/dwi_x_1750.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_1750
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
+; Apply gradient in mT/m for each axis. Gradients are active for one TIME_STEP
 GRADIENT_XYZ[0] = 18.69608 0.0 0.0
 GRADIENT_XYZ[1] = 18.69608 0.0 0.0
diff --git a/config/dwi/dwi_x_1800.ini b/config/dwi/dwi_x_1800.ini
index 57898ee..ed13fce 100644
--- a/config/dwi/dwi_x_1800.ini
+++ b/config/dwi/dwi_x_1800.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_1800
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 18.96129 0.0 0.0
-GRADIENT_XYZ[1] = 18.96129 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 18317.98257 0.0 0.0
+GRADIENT_XYZ[1] = 18317.98257 0.0 0.0
diff --git a/config/dwi/dwi_x_1900.ini b/config/dwi/dwi_x_1900.ini
index 682d6ad..eb0a00c 100644
--- a/config/dwi/dwi_x_1900.ini
+++ b/config/dwi/dwi_x_1900.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_1900
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 19.48087 0.0 0.0
-GRADIENT_XYZ[1] = 19.48087 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 18819.93805 0.0 0.0
+GRADIENT_XYZ[1] = 18819.93805 0.0 0.0
diff --git a/config/dwi/dwi_x_200.ini b/config/dwi/dwi_x_200.ini
index 6035e34..cae0188 100644
--- a/config/dwi/dwi_x_200.ini
+++ b/config/dwi/dwi_x_200.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_200
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 6.32043 0.0 0.0
-GRADIENT_XYZ[1] = 6.32043 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 6105.99419 0.0 0.0
+GRADIENT_XYZ[1] = 6105.99419 0.0 0.0
diff --git a/config/dwi/dwi_x_2000.ini b/config/dwi/dwi_x_2000.ini
index 9793f55..f77ae81 100644
--- a/config/dwi/dwi_x_2000.ini
+++ b/config/dwi/dwi_x_2000.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_2000
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 19.98695 0.0 0.0
-GRADIENT_XYZ[1] = 19.98695 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 19308.84903 0.0 0.0
+GRADIENT_XYZ[1] = 19308.84903 0.0 0.0
diff --git a/config/dwi/dwi_x_2100.ini b/config/dwi/dwi_x_2100.ini
index b201076..009a937 100644
--- a/config/dwi/dwi_x_2100.ini
+++ b/config/dwi/dwi_x_2100.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_2100
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 20.48053 0.0 0.0
-GRADIENT_XYZ[1] = 20.48053 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 19785.68253 0.0 0.0
+GRADIENT_XYZ[1] = 19785.68253 0.0 0.0
diff --git a/config/dwi/dwi_x_2200.ini b/config/dwi/dwi_x_2200.ini
index 761d556..04e1af5 100644
--- a/config/dwi/dwi_x_2200.ini
+++ b/config/dwi/dwi_x_2200.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_2200
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 20.96249 0.0 0.0
-GRADIENT_XYZ[1] = 20.96249 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 20251.29171 0.0 0.0
+GRADIENT_XYZ[1] = 20251.29171 0.0 0.0
diff --git a/config/dwi/dwi_x_2300.ini b/config/dwi/dwi_x_2300.ini
index 83b61b5..30d0c4b 100644
--- a/config/dwi/dwi_x_2300.ini
+++ b/config/dwi/dwi_x_2300.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_2300
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 21.43362 0.0 0.0
-GRADIENT_XYZ[1] = 21.43362 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 20706.43374 0.0 0.0
+GRADIENT_XYZ[1] = 20706.43374 0.0 0.0
diff --git a/config/dwi/dwi_x_2400.ini b/config/dwi/dwi_x_2400.ini
index 6dec13f..694666e 100644
--- a/config/dwi/dwi_x_2400.ini
+++ b/config/dwi/dwi_x_2400.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_2400
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 21.89461 0.0 0.0
-GRADIENT_XYZ[1] = 21.89461 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 21151.78434 0.0 0.0
+GRADIENT_XYZ[1] = 21151.78434 0.0 0.0
diff --git a/config/dwi/dwi_x_2500.ini b/config/dwi/dwi_x_2500.ini
index 89477b6..1f6ebb2 100644
--- a/config/dwi/dwi_x_2500.ini
+++ b/config/dwi/dwi_x_2500.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_2500
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 22.34609 0.0 0.0
-GRADIENT_XYZ[1] = 22.34609 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 21587.94949 0.0 0.0
+GRADIENT_XYZ[1] = 21587.94949 0.0 0.0
diff --git a/config/dwi/dwi_x_2600.ini b/config/dwi/dwi_x_2600.ini
index c06be86..cfa9285 100644
--- a/config/dwi/dwi_x_2600.ini
+++ b/config/dwi/dwi_x_2600.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_2600
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 22.78863 0.0 0.0
-GRADIENT_XYZ[1] = 22.78863 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 22015.47515 0.0 0.0
+GRADIENT_XYZ[1] = 22015.47515 0.0 0.0
diff --git a/config/dwi/dwi_x_2700.ini b/config/dwi/dwi_x_2700.ini
index 58e6da5..50c4c9e 100644
--- a/config/dwi/dwi_x_2700.ini
+++ b/config/dwi/dwi_x_2700.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_2700
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 23.22274 0.0 0.0
-GRADIENT_XYZ[1] = 23.22274 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 22434.85521 0.0 0.0
+GRADIENT_XYZ[1] = 22434.85521 0.0 0.0
diff --git a/config/dwi/dwi_x_2800.ini b/config/dwi/dwi_x_2800.ini
index 47e56cb..dbc5a66 100644
--- a/config/dwi/dwi_x_2800.ini
+++ b/config/dwi/dwi_x_2800.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_2800
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 23.64888 0.0 0.0
-GRADIENT_XYZ[1] = 23.64888 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 22846.53827 0.0 0.0
+GRADIENT_XYZ[1] = 22846.53827 0.0 0.0
diff --git a/config/dwi/dwi_x_2900.ini b/config/dwi/dwi_x_2900.ini
index dd1b260..990f604 100644
--- a/config/dwi/dwi_x_2900.ini
+++ b/config/dwi/dwi_x_2900.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_2900
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 24.06748 0.0 0.0
-GRADIENT_XYZ[1] = 24.06748 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 23250.93317 0.0 0.0
+GRADIENT_XYZ[1] = 23250.93317 0.0 0.0
diff --git a/config/dwi/dwi_x_300.ini b/config/dwi/dwi_x_300.ini
index dd19e6e..d0ee135 100644
--- a/config/dwi/dwi_x_300.ini
+++ b/config/dwi/dwi_x_300.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_300
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 7.74091 0.0 0.0
-GRADIENT_XYZ[1] = 7.74091 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 7478.28507 0.0 0.0
+GRADIENT_XYZ[1] = 7478.28507 0.0 0.0
diff --git a/config/dwi/dwi_x_3000.ini b/config/dwi/dwi_x_3000.ini
index a76d12a..f2698f0 100644
--- a/config/dwi/dwi_x_3000.ini
+++ b/config/dwi/dwi_x_3000.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_3000
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 24.47892 0.0 0.0
-GRADIENT_XYZ[1] = 24.47892 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 23648.41382 0.0 0.0
+GRADIENT_XYZ[1] = 23648.41382 0.0 0.0
diff --git a/config/dwi/dwi_x_3100.ini b/config/dwi/dwi_x_3100.ini
index 41b21ee..6cee969 100644
--- a/config/dwi/dwi_x_3100.ini
+++ b/config/dwi/dwi_x_3100.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_3100
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 24.88356 0.0 0.0
-GRADIENT_XYZ[1] = 24.88356 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 24039.32317 0.0 0.0
+GRADIENT_XYZ[1] = 24039.32317 0.0 0.0
diff --git a/config/dwi/dwi_x_3200.ini b/config/dwi/dwi_x_3200.ini
index 789b4a3..8c9ca10 100644
--- a/config/dwi/dwi_x_3200.ini
+++ b/config/dwi/dwi_x_3200.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_3200
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 25.28172 0.0 0.0
-GRADIENT_XYZ[1] = 25.28172 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 24423.97677 0.0 0.0
+GRADIENT_XYZ[1] = 24423.97677 0.0 0.0
diff --git a/config/dwi/dwi_x_3300.ini b/config/dwi/dwi_x_3300.ini
index bb7cfa0..4124b0d 100644
--- a/config/dwi/dwi_x_3300.ini
+++ b/config/dwi/dwi_x_3300.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_3300
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 25.67371 0.0 0.0
-GRADIENT_XYZ[1] = 25.67371 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 24802.66566 0.0 0.0
+GRADIENT_XYZ[1] = 24802.66566 0.0 0.0
diff --git a/config/dwi/dwi_x_3400.ini b/config/dwi/dwi_x_3400.ini
index da8514d..0af39d3 100644
--- a/config/dwi/dwi_x_3400.ini
+++ b/config/dwi/dwi_x_3400.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_3400
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 26.05980 0.0 0.0
-GRADIENT_XYZ[1] = 26.05980 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 25175.65900 0.0 0.0
+GRADIENT_XYZ[1] = 25175.65900 0.0 0.0
diff --git a/config/dwi/dwi_x_3500.ini b/config/dwi/dwi_x_3500.ini
index 5b3528d..c881ef4 100644
--- a/config/dwi/dwi_x_3500.ini
+++ b/config/dwi/dwi_x_3500.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_3500
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 26.44026 0.0 0.0
-GRADIENT_XYZ[1] = 26.44026 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 25543.20631 0.0 0.0
+GRADIENT_XYZ[1] = 25543.20631 0.0 0.0
diff --git a/config/dwi/dwi_x_3600.ini b/config/dwi/dwi_x_3600.ini
index aaa2772..0697a22 100644
--- a/config/dwi/dwi_x_3600.ini
+++ b/config/dwi/dwi_x_3600.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_3600
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 26.81531 0.0 0.0
-GRADIENT_XYZ[1] = 26.81531 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 25905.53939 0.0 0.0
+GRADIENT_XYZ[1] = 25905.53939 0.0 0.0
diff --git a/config/dwi/dwi_x_3700.ini b/config/dwi/dwi_x_3700.ini
index 6d6e8ca..597fce2 100644
--- a/config/dwi/dwi_x_3700.ini
+++ b/config/dwi/dwi_x_3700.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_3700
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 27.18520 0.0 0.0
-GRADIENT_XYZ[1] = 27.18520 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 26262.87406 0.0 0.0
+GRADIENT_XYZ[1] = 26262.87406 0.0 0.0
diff --git a/config/dwi/dwi_x_3800.ini b/config/dwi/dwi_x_3800.ini
index aa0ac22..80bd1da 100644
--- a/config/dwi/dwi_x_3800.ini
+++ b/config/dwi/dwi_x_3800.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_3800
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 27.55012 0.0 0.0
-GRADIENT_XYZ[1] = 27.55012 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 26615.41163 0.0 0.0
+GRADIENT_XYZ[1] = 26615.41163 0.0 0.0
diff --git a/config/dwi/dwi_x_3900.ini b/config/dwi/dwi_x_3900.ini
index a3b14b9..8cc47cb 100644
--- a/config/dwi/dwi_x_3900.ini
+++ b/config/dwi/dwi_x_3900.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_3900
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 27.91026 0.0 0.0
-GRADIENT_XYZ[1] = 27.91026 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 26963.34028 0.0 0.0
+GRADIENT_XYZ[1] = 26963.34028 0.0 0.0
diff --git a/config/dwi/dwi_x_400.ini b/config/dwi/dwi_x_400.ini
index 3555e31..b9cda89 100644
--- a/config/dwi/dwi_x_400.ini
+++ b/config/dwi/dwi_x_400.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_400
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 8.93844 0.0 0.0
-GRADIENT_XYZ[1] = 8.93844 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 8635.17980 0.0 0.0
+GRADIENT_XYZ[1] = 8635.17980 0.0 0.0
diff --git a/config/dwi/dwi_x_4000.ini b/config/dwi/dwi_x_4000.ini
index 956cf87..2ee99be 100644
--- a/config/dwi/dwi_x_4000.ini
+++ b/config/dwi/dwi_x_4000.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_4000
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 28.26582 0.0 0.0
-GRADIENT_XYZ[1] = 28.26582 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 27306.83617 0.0 0.0
+GRADIENT_XYZ[1] = 27306.83617 0.0 0.0
diff --git a/config/dwi/dwi_x_4100.ini b/config/dwi/dwi_x_4100.ini
index b4fdf3a..ab16561 100644
--- a/config/dwi/dwi_x_4100.ini
+++ b/config/dwi/dwi_x_4100.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_4100
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 28.61696 0.0 0.0
-GRADIENT_XYZ[1] = 28.61696 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 27646.06453 0.0 0.0
+GRADIENT_XYZ[1] = 27646.06453 0.0 0.0
diff --git a/config/dwi/dwi_x_4200.ini b/config/dwi/dwi_x_4200.ini
index 8e0883a..f969010 100644
--- a/config/dwi/dwi_x_4200.ini
+++ b/config/dwi/dwi_x_4200.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_4200
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 28.96385 0.0 0.0
-GRADIENT_XYZ[1] = 28.96385 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 27981.18058 0.0 0.0
+GRADIENT_XYZ[1] = 27981.18058 0.0 0.0
diff --git a/config/dwi/dwi_x_4300.ini b/config/dwi/dwi_x_4300.ini
index 33539a5..d66b7e0 100644
--- a/config/dwi/dwi_x_4300.ini
+++ b/config/dwi/dwi_x_4300.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_4300
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 29.30663 0.0 0.0
-GRADIENT_XYZ[1] = 29.30663 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 28312.33033 0.0 0.0
+GRADIENT_XYZ[1] = 28312.33033 0.0 0.0
diff --git a/config/dwi/dwi_x_4400.ini b/config/dwi/dwi_x_4400.ini
index 4380e07..f6391dd 100644
--- a/config/dwi/dwi_x_4400.ini
+++ b/config/dwi/dwi_x_4400.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_4400
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 29.64544 0.0 0.0
-GRADIENT_XYZ[1] = 29.64544 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 28639.65139 0.0 0.0
+GRADIENT_XYZ[1] = 28639.65139 0.0 0.0
diff --git a/config/dwi/dwi_x_4500.ini b/config/dwi/dwi_x_4500.ini
index b475c86..6c924f9 100644
--- a/config/dwi/dwi_x_4500.ini
+++ b/config/dwi/dwi_x_4500.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_4500
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 29.98043 0.0 0.0
-GRADIENT_XYZ[1] = 29.98043 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 28963.27354 0.0 0.0
+GRADIENT_XYZ[1] = 28963.27354 0.0 0.0
diff --git a/config/dwi/dwi_x_4600.ini b/config/dwi/dwi_x_4600.ini
index e97cacf..a38062e 100644
--- a/config/dwi/dwi_x_4600.ini
+++ b/config/dwi/dwi_x_4600.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_4600
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 30.31172 0.0 0.0
-GRADIENT_XYZ[1] = 30.31172 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 29283.31943 0.0 0.0
+GRADIENT_XYZ[1] = 29283.31943 0.0 0.0
diff --git a/config/dwi/dwi_x_4700.ini b/config/dwi/dwi_x_4700.ini
index e771cbb..18f695b 100644
--- a/config/dwi/dwi_x_4700.ini
+++ b/config/dwi/dwi_x_4700.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_4700
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 30.63942 0.0 0.0
-GRADIENT_XYZ[1] = 30.63942 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 29599.90505 0.0 0.0
+GRADIENT_XYZ[1] = 29599.90505 0.0 0.0
diff --git a/config/dwi/dwi_x_4800.ini b/config/dwi/dwi_x_4800.ini
index 273fbbf..4f5a008 100644
--- a/config/dwi/dwi_x_4800.ini
+++ b/config/dwi/dwi_x_4800.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_4800
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 30.96366 0.0 0.0
-GRADIENT_XYZ[1] = 30.96366 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 29913.14028 0.0 0.0
+GRADIENT_XYZ[1] = 29913.14028 0.0 0.0
diff --git a/config/dwi/dwi_x_4900.ini b/config/dwi/dwi_x_4900.ini
index 221c689..bd212e7 100644
--- a/config/dwi/dwi_x_4900.ini
+++ b/config/dwi/dwi_x_4900.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_4900
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 31.28453 0.0 0.0
-GRADIENT_XYZ[1] = 31.28453 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 30223.12929 0.0 0.0
+GRADIENT_XYZ[1] = 30223.12929 0.0 0.0
diff --git a/config/dwi/dwi_x_50.ini b/config/dwi/dwi_x_50.ini
deleted file mode 100644
index 67f56f6..0000000
--- a/config/dwi/dwi_x_50.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-SEQ_NAME    = dwi_x_50
-[PARENT]
-PARENT_CONFIG = dwi_baseline.ini
-
-[SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 3.16021 0.0 0.0
-GRADIENT_XYZ[1] = 3.16021 0.0 0.0
diff --git a/config/dwi/dwi_x_500.ini b/config/dwi/dwi_x_500.ini
index e1cc76a..289c479 100644
--- a/config/dwi/dwi_x_500.ini
+++ b/config/dwi/dwi_x_500.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_500
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 9.99348 0.0 0.0
-GRADIENT_XYZ[1] = 9.99348 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 9654.42451 0.0 0.0
+GRADIENT_XYZ[1] = 9654.42451 0.0 0.0
diff --git a/config/dwi/dwi_x_5000.ini b/config/dwi/dwi_x_5000.ini
index 0e02478..db2c3fa 100644
--- a/config/dwi/dwi_x_5000.ini
+++ b/config/dwi/dwi_x_5000.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_5000
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 31.60215 0.0 0.0
-GRADIENT_XYZ[1] = 31.60215 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 30529.97096 0.0 0.0
+GRADIENT_XYZ[1] = 30529.97096 0.0 0.0
diff --git a/config/dwi/dwi_x_600.ini b/config/dwi/dwi_x_600.ini
index 648a46f..e98a6cb 100644
--- a/config/dwi/dwi_x_600.ini
+++ b/config/dwi/dwi_x_600.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_600
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 10.94731 0.0 0.0
-GRADIENT_XYZ[1] = 10.94731 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 10575.89217 0.0 0.0
+GRADIENT_XYZ[1] = 10575.89217 0.0 0.0
diff --git a/config/dwi/dwi_x_700.ini b/config/dwi/dwi_x_700.ini
index d410d56..2fae4ef 100644
--- a/config/dwi/dwi_x_700.ini
+++ b/config/dwi/dwi_x_700.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_700
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 11.82444 0.0 0.0
-GRADIENT_XYZ[1] = 11.82444 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 11423.26914 0.0 0.0
+GRADIENT_XYZ[1] = 11423.26914 0.0 0.0
diff --git a/config/dwi/dwi_x_800.ini b/config/dwi/dwi_x_800.ini
index 87633c0..35ecb86 100644
--- a/config/dwi/dwi_x_800.ini
+++ b/config/dwi/dwi_x_800.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_800
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 12.64086 0.0 0.0
-GRADIENT_XYZ[1] = 12.64086 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 12211.98838 0.0 0.0
+GRADIENT_XYZ[1] = 12211.98838 0.0 0.0
diff --git a/config/dwi/dwi_x_900.ini b/config/dwi/dwi_x_900.ini
index a956c59..513e029 100644
--- a/config/dwi/dwi_x_900.ini
+++ b/config/dwi/dwi_x_900.ini
@@ -3,6 +3,6 @@ SEQ_NAME    = dwi_x_900
 PARENT_CONFIG = dwi_baseline.ini
 
 [SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 13.40766 0.0 0.0
-GRADIENT_XYZ[1] = 13.40766 0.0 0.0
+; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME
+GRADIENT_XYZ[0] = 12952.76970 0.0 0.0
+GRADIENT_XYZ[1] = 12952.76970 0.0 0.0
diff --git a/config/dwi/dwi_y_500.ini b/config/dwi/dwi_y_500.ini
deleted file mode 100644
index 48739a2..0000000
--- a/config/dwi/dwi_y_500.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-SEQ_NAME    = dwi_y_500
-[PARENT]
-PARENT_CONFIG = dwi_baseline.ini
-
-[SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 0.0 9.99348 0.0
-GRADIENT_XYZ[1] = 0.0 9.99348 0.0
diff --git a/config/dwi/dwi_z_500.ini b/config/dwi/dwi_z_500.ini
deleted file mode 100644
index 809dba3..0000000
--- a/config/dwi/dwi_z_500.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-SEQ_NAME    = dwi_z_500
-[PARENT]
-PARENT_CONFIG = dwi_baseline.ini
-
-[SCAN_PARAMETERS]
-; Apply gradient in T/m for each axis. Gradients are active for one TIME_STEP
-GRADIENT_XYZ[0] = 0.0 0.0 9.99348
-GRADIENT_XYZ[1] = 0.0 0.0 9.99348
diff --git a/src/shapes/shape_base.cpp b/src/shapes/shape_base.cpp
index c33670d..5a0ff9f 100644
--- a/src/shapes/shape_base.cpp
+++ b/src/shapes/shape_base.cpp
@@ -82,7 +82,7 @@ bool shape::save()
     // save fov
     float fov[3] = {m_fov, m_fov, m_fov};
     std::vector<size_t> dims_fov(1, 3);
-    HighFive::DataSet dataset_fov = file.createDataSet<uint8_t>("fov", HighFive::DataSpace(dims_fov));
+    HighFive::DataSet dataset_fov = file.createDataSet<float>("fov", HighFive::DataSpace(dims_fov));
     dataset_fov.write_raw(fov);
     return true;
 }
diff --git a/src/simulation_parameters.h b/src/simulation_parameters.h
index c2df64f..d2f7181 100644
--- a/src/simulation_parameters.h
+++ b/src/simulation_parameters.h
@@ -104,7 +104,6 @@ typedef struct simulation_parameters
         ss<<"T1 = "; for(int i=0; i<n_tissue_type; i++) ss<<T1_ms[i]<<' '; ss<<"ms.\n";
         ss<<"Step size = "; for(int i=0; i<n_tissue_type; i++) ss<<diffusivity[i]<<' '; ss<<"\n";
         ss<<"Cross Tissue Probability =\n"; for(int i=0; i<n_tissue_type; i++) {for(int j=0; j<n_tissue_type; j++) ss<<pXY[j+i*n_tissue_type]<<' '; ss<<'\n';};
-
         ss<<"RF flip-angle   = "; for(int i=0; i<n_RF; i++) ss<<RF_FA_deg[i]<<' '; ss<<"deg.\n";
         ss<<"RF phase        = "; for(int i=0; i<n_RF; i++) ss<<RF_PH_deg[i]<<' '; ss<<"deg.\n";
         ss<<"RF time         = "; for(int i=0; i<n_RF; i++) ss<<RF_us[i]*timestep_us<<' '; ss<<"us.\n";
@@ -128,6 +127,7 @@ typedef struct simulation_parameters
         ss<<"mask exists     = "<< mask_exist<<'\n';
         ss<<"off-resonance exists   = "<< fieldmap_exist<<'\n';
         ss<<"gradient (x,y,z) mT/m  =\n"; for(int i=0; i<n_gradient; i++) ss<<gradient_mTm[3*i+0]<<' '<<gradient_mTm[3*i+1]<<' '<<gradient_mTm[3*i+2]<<'\n';
+        ss<<"gradient  time         =\n"; for(int i=0; i<n_gradient; i++) ss<<gradient_us[i]*timestep_us<<' '; ss<<"us.\n";
         ss<<"Record Trajectory      = "<< enRecordTrajectory << '\n';
         ss<<"Required CPU memory    = "<<get_required_memory(1, "cpu")<<" MB\n";
         ss<<"Required GPU memory    = "<<get_required_memory(1, "gpu")<<" MB\n";
diff --git a/src/version.h b/src/version.h
index 74d672c..055061a 100644
--- a/src/version.h
+++ b/src/version.h
@@ -6,7 +6,7 @@
 
 #define SPINWALK_VERSION_MAJOR 1
 #define SPINWALK_VERSION_MINOR 13
-#define SPINWALK_VERSION_PATCH 0
+#define SPINWALK_VERSION_PATCH 1
 
 //---------------------------------------------------------------------------------------------
 //  
diff --git a/tests/plot_results.m b/tests/plot_results.m
index cf80071..fd76eaa 100644
--- a/tests/plot_results.m
+++ b/tests/plot_results.m
@@ -181,22 +181,51 @@
 
 % nonzeros(xyz_all)
 
+%% Calculate Gradient Strength for certain b-value in diffusion simulations
+clc
+b = 100:100:5000; % s/mm^2
+gamma = 267.5153151e6;
+d = 50e-6; % gradient duration
+D = 30e-3; % distance between gradients
+
+G = b * 1e6 ./ (gamma * gamma * d * d * (D-d/3));
+G = sqrt(G);  % T/m
+G = G * 1000; % mT/m
+disp(G')
+
+for i = 1:length(b)
+    % Open text file for writing
+    filename = sprintf('/DATA/aaghaeifar/Nextcloud/Projects/microvascular/SpinWalk/config/dwi/dwi_x_%d.ini', b(i));
+    fid = fopen(filename, 'w');    
+    % Write to text file
+    fprintf(fid, 'SEQ_NAME    = dwi_x_%d\n', b(i));
+    fprintf(fid, '[PARENT]\n');
+    fprintf(fid, 'PARENT_CONFIG = dwi_baseline.ini\n\n');
+    fprintf(fid, '[SCAN_PARAMETERS]\n');
+    fprintf(fid, '; Apply gradient in mT/m for each axis. Gradients are active for one DWELL_TIME\n');
+    fprintf(fid, 'GRADIENT_XYZ[0] = %.5f 0.0 0.0\n', G(i));
+    fprintf(fid, 'GRADIENT_XYZ[1] = %.5f 0.0 0.0\n', G(i));
+    % Close text file
+    fclose(fid);
+end
+
+
 %% diffusion
 clc
 clear
 
 folder = '../../outputs/dwi';
-base = 'dwi_base_restricted_diffusion_model_sphere.h5';
+base = 'dwi_base_free_diffusion_model.h5';
 
 b = 100:100:5000;
 
 m1 = permute(h5read(fullfile(folder, base), '/M'), 4:-1:1); 
-s0 = abs(complex(sum(m1(1,end-1,:)), sum(m1(2,end-1,:))));
+s0 = abs(complex(sum(m1(1,:,end-1,1)), sum(m1(1,:,end-1,2))));
 s_dwi  = zeros(numel(b), 1);
 for i=1:numel(b) 
-    f = fullfile(folder, ['dwi_x_' num2str(b(i)) '_restricted_diffusion_model_sphere.h5' ]);
+    f = fullfile(folder, ['dwi_x_' num2str(b(i)) '_free_diffusion_model.h5' ]);
     m1 = permute(h5read(f, '/M'), 4:-1:1); 
-    s_dwi(i) = abs(complex(sum(m1(1,end-1,:)), sum(m1(2,end-1,:))));
+    s_dwi(i) = abs(complex(sum(m1(1,:,end-1,1)), sum(m1(1,:,end-1,2))));
 end
 s = [s0; s_dwi];
 b = [0, b];
@@ -205,10 +234,10 @@
 
 % Virtual b-value
 b = 100:100:5000;
-f = fullfile(folder, ['dwi_x_' num2str(b(1)) '_restricted_diffusion_model_sphere.h5' ]);
+f = fullfile(folder, ['dwi_x_' num2str(b(1)) '_free_diffusion_model.h5' ]);
 m1 = permute(h5read(f, '/M'), 4:-1:1); 
 xyz = permute(h5read(f, '/XYZ'), 4:-1:1); 
-[theta, rho] = cart2pol(m1(1,end-1,:), m1(2,end-1,:));
+[theta, rho] = cart2pol(m1(1,:,end-1,1), m1(1,:,end-1,2));
 G_scale = sqrt(b / b(1));
 for i=1:numel(b)     
     % sig = squeeze(rho) .* exp(1j*(squeeze(theta) * G_scale(i)));
@@ -217,7 +246,7 @@
     s_dwi(i) = abs(complex(sum(x), sum(y)));
 end
 s2 = [s0; s_dwi];
-b2 = [0, b];5
+b2 = [0, b];
 
 [xData_v, yData_v] = prepareCurveData( double(b2(:)), double(s2(:)) );