diff --git a/site_ansto/instrument/tas/config/motors/motor_configuration.tcl b/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
index 6e1b5efa..9075fc64 100644
--- a/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
@@ -133,13 +133,13 @@ Motor mtilt $motor_driver_type [params \
   maxDecel 1\
   stepsPerX 25000\
   absEnc 1\
-  absEncHome 79651\
+  absEncHome 79650\
   cntsPerX 4096]
 mtilt part crystal
 mtilt long_name mtilt
 mtilt softlowerlim -5
 mtilt softupperlim 5
-mtilt home 0.151
+mtilt home 0
 #}
 
 set atest mtilt
@@ -164,7 +164,7 @@ mtrans part crystal
 mtrans long_name mtrans
 mtrans softlowerlim -10
 mtrans softupperlim 195
-mtrans home 66.991
+mtrans home 0.0
 
 # mc1: Fight Tube Rotate
 Motor m2 $motor_driver_type [params \
@@ -178,15 +178,15 @@ Motor m2 $motor_driver_type [params \
   maxSpeed 1\
   maxAccel 0.1\
   maxDecel 0.1\
-  stepsPerX 50000\
+  stepsPerX 120000\
   absEnc 1\
-  absEncHome -124231\
-  cntsPerX 8192]
+  absEncHome 188182\
+  cntsPerX -150]
 m2 part crystal 
 m2 long_name m2
 m2 softlowerlim 17
 m2 softupperlim 53
-m2 home 38.17141 
+m2 home 40
 
 # mc1: Detector Rotate
 Motor a2 $motor_driver_type [params \
@@ -202,13 +202,13 @@ Motor a2 $motor_driver_type [params \
   maxDecel 0.2\
   stepsPerX 125000\
   absEnc 1\
-  absEncHome 10194201\
-  cntsPerX 93206.7556]
+  absEncHome 17817421\
+  cntsPerX -93206.7556]
 a2 part detector
 a2 long_name a2
 a2 softlowerlim -55
 a2 softupperlim 88
-a2 home 41.16916
+a2 home 0.0
 
 
 ############################
@@ -232,7 +232,7 @@ Motor sgu $motor_driver_type [params \
   maxDecel 1\
   stepsPerX 25000\
   absEnc 1\
-  absEncHome 7745436\
+  absEncHome 7747640\
   cntsPerX 8192]
 sgu part sample
 sgu long_name sgu
@@ -254,7 +254,7 @@ Motor sgl $motor_driver_type [params \
   maxDecel 1\
   stepsPerX 25000\
   absEnc 1\
-  absEncHome 7499179\
+  absEncHome 7491892\
   cntsPerX 8192]
 sgl part sample
 sgl long_name sgl
@@ -274,15 +274,15 @@ Motor stu $motor_driver_type [params \
   maxSpeed 2\
   maxAccel 1\
   maxDecel 1\
-  stepsPerX 25000\
+  stepsPerX -25000\
   absEnc 1\
-  absEncHome 7392971\
-  cntsPerX 8192]
+  absEncHome 7392933\
+  cntsPerX -8192]
 stu part sample
 stu long_name stu
 stu softlowerlim -15
 stu softupperlim 15
-stu home -0.002
+stu home 0.0
 
 # mc2: Sample Lower Tanslation
 Motor stl $motor_driver_type [params \
@@ -298,13 +298,13 @@ Motor stl $motor_driver_type [params \
   maxDecel 1\
   stepsPerX 25000\
   absEnc 1\
-  absEncHome 7582791\
+  absEncHome 7582773\
   cntsPerX 8192]
 stl part sample
 stl long_name stl
 stl softlowerlim -15
 stl softupperlim 15
-stl home -0.001
+stl home 0.0
 
 # mc2: Sample Rotate
 Motor s1 $motor_driver_type [params \
@@ -313,20 +313,20 @@ Motor s1 $motor_driver_type [params \
   port pmc2-taipan\
   axis E\
   units degrees\
-  hardlowerlim -170\
-  hardupperlim 90\
+  hardlowerlim -100\
+  hardupperlim 110\
   maxSpeed 4\
   maxAccel 2\
   maxDecel 2\
   stepsPerX 12500\
   absEnc 1\
-  absEncHome 18156361\
-  cntsPerX 93206.7556]
+  absEncHome 10547623\
+  cntsPerX 4096]
 s1 part sample
 s1 long_name s1
 s1 softlowerlim -170
 s1 softupperlim 90
-s1 home -85.38518
+s1 home 0.0
 
 # mc2: Analyser Detector Rotate -- Sample Scattering Angle
 Motor s2 $motor_driver_type [params \
@@ -335,20 +335,20 @@ Motor s2 $motor_driver_type [params \
   port pmc2-taipan\
   axis F\
   units degrees\
-  hardlowerlim -78\
-  hardupperlim -1.9\
+  hardlowerlim -95\
+  hardupperlim 30\
   maxSpeed 0.8\
   maxAccel 0.2\
   maxDecel 0.2\
   stepsPerX 125000\
   absEnc 1\
-  absEncHome 27256910\
-  cntsPerX 93206.7556]
+  absEncHome 16860254\
+  cntsPerX -93206.7556]
 s2 part sample 
 s2 long_name s2
 s2 softlowerlim -78
 s2 softupperlim -1.9
-s2 home -75.58425
+s2 home -53.28674
 
 # mc2: Analyser Horizontal Focus
 Motor ahfocus $motor_driver_type [params \
@@ -453,13 +453,13 @@ Motor m1 $motor_driver_type [params \
   maxDecel 0.25\
   stepsPerX 100000\
   absEnc 1\
-  absEncHome 16310005\
-  cntsPerX 4096]
+  absEncHome 16364945\
+  cntsPerX -2048]
 m1 part crystal
 m1 long_name m1
 m1 softlowerlim 5
 m1 softupperlim 40
-m1 home 8.97251
+m1 home 0.0
 
 # mc4: Analyzer Tilt 1 -- Two-theta Angle
 Motor atilt $motor_driver_type [params \
@@ -481,7 +481,7 @@ atilt part crystal
 atilt long_name atilt
 atilt softlowerlim -5
 atilt softupperlim 5
-atilt home 0.001
+atilt home 0.0
 
 # mc4: Analyzer Translate
 Motor atrans $motor_driver_type [params \
@@ -497,13 +497,13 @@ Motor atrans $motor_driver_type [params \
   maxDecel 1\
   stepsPerX 25000\
   absEnc 1\
-  absEncHome 23560555\
-  cntsPerX 8192]
+  absEncHome 23726444\
+  cntsPerX -8192]
 atrans part crystal 
 atrans long_name atrans
 atrans softlowerlim -1
 atrans softupperlim 22
-atrans home 10.12476
+atrans home 0.0
 
 # mc4: Analyzer Rotate
 Motor a1 $motor_driver_type [params \
@@ -519,13 +519,13 @@ Motor a1 $motor_driver_type [params \
   maxDecel 2\
   stepsPerX 12500\
   absEnc 1\
-  absEncHome 24646226\
-  cntsPerX 8192]
+  absEncHome 24730617\
+  cntsPerX 4096]
 a1 part crystal
 a1 long_name a1
 a1 softlowerlim -5.1
 a1 softupperlim 45
-a1 home 20.58360
+a1 home 0.0
 
 # mc4: Virtural Source Left Translation
 Motor VS_left $motor_driver_type [params \
@@ -541,13 +541,13 @@ Motor VS_left $motor_driver_type [params \
   maxDecel 6\
   stepsPerX 4166.6667\
   absEnc 1\
-  absEncHome 14471941\
-  cntsPerX 4096]
+  absEncHome 14557281\
+  cntsPerX 682.656]
 VS_left part slits
 VS_left long_name VS_left
 VS_left softlowerlim 2
 VS_left softupperlim 41
-VS_left home 25.0019
+VS_left home 0.0
 
 # mc4: Virtural Source Right Translation
 Motor VS_right $motor_driver_type [params \
@@ -563,13 +563,13 @@ Motor VS_right $motor_driver_type [params \
   maxDecel 6\
   stepsPerX 4166.6667\
   absEnc 1\
-  absEncHome 16354268\
-  cntsPerX 4096]
+  absEncHome 16269006\
+  cntsPerX 682.656]
 VS_right part slits 
 VS_right long_name VS_right
 VS_right softlowerlim -41
 VS_right softupperlim -2
-VS_right home -24.9790
+VS_right home 0.0
 
 # mc4: Filter Rotate
 #Jing: current no data from SPiCe, based on Gali reading only