diff --git a/site_ansto/instrument/reflectometer/motor_configuration.tcl b/site_ansto/instrument/reflectometer/motor_configuration.tcl
index a9442931..a127c3af 100644
--- a/site_ansto/instrument/reflectometer/motor_configuration.tcl
+++ b/site_ansto/instrument/reflectometer/motor_configuration.tcl
@@ -1,5 +1,5 @@
-# $Revision: 1.9 $
-# $Date: 2007-03-14 03:06:18 $
+# $Revision: 1.10 $
+# $Date: 2007-03-15 21:57:31 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: dcl $
 
@@ -21,19 +21,19 @@ set dmc2280_controller4(port) pmc4-$animal
 
 #Measured absolute encoder reading at home position
 
-set dsvt_home 8172500
+set bz_home 8142000
 set c1ht_home 8265000
 set m1ro_home 134658
 set bat_home 7500000
 set st3vt_home 8742250
 set st4vt_home 8806900
-set sath_home 7500000
-set saphi_home 7500000
-set sax_home 7500000
-set say_home 7500000
-set saz_home 8927484
-set deyht_home 7500000
-set dezht_home 7500000
+set sth_home 23511400
+set sphi_home 7548440
+set sx_home 8574000
+set sy_home 7500000
+set sz_home 8927484
+set dy_home 7500000
+set dz_home 7805000
 
 #Measured or computed slit motor steps per millimetre
 # 125 steps * 161:1 gears = 20125
@@ -77,23 +77,23 @@ set move_count 100
 #
 
 # Beam Shade Vertical Translation (6mm/T double helix, 500mm)
-Motor dszvt DMC2280 [params \
+Motor bz DMC2280 [params \
   host $dmc2280_controller1(host)\
   port $dmc2280_controller1(port)\
   axis A\
   units mm\
   hardlowerlim 0\
   hardupperlim 275\
-  maxSpeed 1\
+  maxSpeed 5\
   maxAccel 1\
   maxDecel 1\
   stepsPerX [expr -25000/6]\
   absEnc 1\
-  absEncHome $dsvt_home\
+  absEncHome $bz_home\
   cntsPerX [expr -8192/6]]
-dszvt softlowerlim 0
-dszvt softupperlim 275
-dszvt home 0
+bz softlowerlim 0
+bz softupperlim 275
+bz home 0
 
 # Collimator Table Horizontal Translation, X
 Motor c1ht DMC2280 [params \
@@ -102,16 +102,16 @@ Motor c1ht DMC2280 [params \
   axis B\
   units mm\
   hardlowerlim 0\
-  hardupperlim 0\
-  maxSpeed 1\
+  hardupperlim 1065\
+  maxSpeed 10\
   maxAccel 1\
   maxDecel 1\
   stepsPerX [expr 25000/5]\
   absEnc 1\
   absEncHome $c1ht_home\
-  cntsPerX [expr 8192/5]
+  cntsPerX [expr -8192/5]]
 c1ht softlowerlim 0
-c1ht softupperlim 0
+c1ht softupperlim 1065
 c1ht home 0
 
 # Collimator Tilt, Z axis, positive is down
@@ -128,7 +128,7 @@ Motor m1ro DMC2280 [params \
   stepsPerX 275000\
   absEnc 1\
   absEncHome $m1ro_home\
-  cntsPerX [expr 262144/360]]
+  cntsPerX [expr -262144/360]]
 m1ro softlowerlim -3.5
 m1ro softupperlim 3.5
 m1ro home 0
@@ -159,8 +159,8 @@ Motor st3vt DMC2280 [params \
   axis E\
   units mm\
   hardlowerlim 0\
-  hardupperlim 251\
-  maxSpeed 1\
+  hardupperlim 253\
+  maxSpeed 10\
   maxAccel 1\
   maxDecel 1\
   stepsPerX 25000\
@@ -168,7 +168,7 @@ Motor st3vt DMC2280 [params \
   absEncHome $st3vt_home\
   cntsPerX -8192]
 st3vt softlowerlim 0
-st3vt softupperlim 251
+st3vt softupperlim 253
 st3vt home 0
 
 # Slit 4 Tower Translation (1mm/T, +/- 100mm)
@@ -178,8 +178,8 @@ Motor st4vt DMC2280 [params \
   axis F\
   units mm\
   hardlowerlim 0\
-  hardupperlim 248\
-  maxSpeed 1\
+  hardupperlim 249\
+  maxSpeed 10\
   maxAccel 1\
   maxDecel 1\
   stepsPerX 25000\
@@ -187,7 +187,7 @@ Motor st4vt DMC2280 [params \
   absEncHome $st4vt_home\
   cntsPerX -8192]
 st4vt softlowerlim 0
-st4vt softupperlim 248
+st4vt softupperlim 249
 st4vt home 0
 
 ############################
@@ -199,7 +199,7 @@ st4vt home 0
 #
 
 # Sample Tilt 1, upper (1 degree/turn)
-Motor sath DMC2280 [params \
+Motor sth DMC2280 [params \
   host $dmc2280_controller2(host)\
   port $dmc2280_controller2(port)\
   axis A\
@@ -211,52 +211,52 @@ Motor sath DMC2280 [params \
   maxDecel 1\
   stepsPerX 25000\
   absEnc 1\
-  absEncHome $sath_home\
+  absEncHome $sth_home\
   cntsPerX 8192]
-setHomeandRange -motor sath -home 0 -lowrange 15 -uprange 15
-sath speed 1
-sath precision 0.01
+setHomeandRange -motor sth -home 0 -lowrange 5 -uprange 5
+sth speed 1
+sth precision 0.01
 
 # Sample Tilt 2, lower (1 degree/turn)
-Motor saphi DMC2280 [params \
+Motor sphi DMC2280 [params \
   host $dmc2280_controller2(host)\
   port $dmc2280_controller2(port)\
   axis B\
   units degrees\
-  hardlowerlim -15\
-  hardupperlim 15\
+  hardlowerlim 75\
+  hardupperlim 105\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
   stepsPerX -25000\
   absEnc 1\
-  absEncHome $saphi_home\
+  absEncHome $sphi_home\
   cntsPerX -8192]
-setHomeandRange -motor saphi -home 90 -lowrange 15 -uprange 15
-saphi speed 1
-saphi precision 0.01
+setHomeandRange -motor sphi -home 90 -lowrange 5 -uprange 5
+sphi speed 1
+sphi precision 0.01
 
 # Sample Translation, Linear X (5mm/T, 0-750mm)
-Motor sax DMC2280 [params \
+Motor sx DMC2280 [params \
   host $dmc2280_controller2(host)\
   port $dmc2280_controller2(port)\
   axis C\
   units mm\
   hardlowerlim 0\
-  hardupperlim 750\
-  maxSpeed 1\
+  hardupperlim 734\
+  maxSpeed 10\
   maxAccel 1\
   maxDecel 1\
   stepsPerX [expr 25000/5]\
   absEnc 1\
-  absEncHome $sax_home\
+  absEncHome $sx_home\
   cntsPerX [expr 8192/5]]
-sax softlowerlim 0
-sax softupperlim 750
-sax home 0
+sx softlowerlim 0
+sx softupperlim 730
+sx home 0
 
 # Sample Translation, Linear Y
-#Motor say DMC2280 [params \
+#Motor sy DMC2280 [params \
 #  host $dmc2280_controller2(host)\
 #  port $dmc2280_controller2(port)\
 #  axis D\
@@ -268,33 +268,34 @@ sax home 0
 #  maxDecel 1\
 #  stepsPerX 25000\
 #  absEnc 1\
-#  absEncHome $say_home\
+#  absEncHome $sy_home\
 #  cntsPerX 8192]
-#say softlowerlim -600
-#say softupperlim -300
-#say home -450
+#sy softlowerlim -600
+#sy softupperlim -300
+#sy home -450
 
 # Sample Translation, Linear Z (??/T, 300mm)
-Motor saz DMC2280 [params \
+Motor sz DMC2280 [params \
   host $dmc2280_controller2(host)\
   port $dmc2280_controller2(port)\
   axis E\
   units mm\
   hardlowerlim 0\
-  hardupperlim 285\
-  maxSpeed 1\
+  hardupperlim 300.5\
+  maxSpeed 2\
   maxAccel 1\
   maxDecel 1\
   stepsPerX [expr -25000*5]\
   absEnc 1\
-  absEncHome $saz_home\
+  absEncHome $sz_home\
   cntsPerX [expr -8192/5]]
-saz softlowerlim 0
-saz softupperlim 285
-saz home 0
+sz softlowerlim 0
+sz softupperlim 300.5
+sz home 0
+sz speed 2
 
 # Detector Translation, Linear Y (Not Motorized)
-#Motor deyht DMC2280 [params \
+#Motor dy DMC2280 [params \
 #  host $dmc2280_controller2(host)\
 #  port $dmc2280_controller2(port)\
 #  axis F\
@@ -306,30 +307,30 @@ saz home 0
 #  maxDecel 1\
 #  stepsPerX 25000\
 #  absEnc 1\
-#  absEncHome $deyht_home\
+#  absEncHome $dy_home\
 #  cntsPerX 8192]
-#deyht softlowerlim -595
-#deyht softupperlim 800
-#deyht home 0
+#dy softlowerlim -595
+#dy softupperlim 800
+#dy home 0
 
 # Detector Translation, Linear Z (5mm/T gearing unknown)
-Motor dezvt DMC2280 [params \
+Motor dz DMC2280 [params \
   host $dmc2280_controller2(host)\
   port $dmc2280_controller2(port)\
   axis G\
   units mm\
   hardlowerlim 0\
-  hardupperlim 1348\
-  maxSpeed 1\
+  hardupperlim 1351\
+  maxSpeed 5\
   maxAccel 1\
   maxDecel 1\
   stepsPerX -25000\
   absEnc 1\
-  absEncHome $dezht_home\
+  absEncHome $dz_home\
   cntsPerX [expr -8192/5]]
-dezvt softlowerlim 0
-dezvt softupperlim 1348
-dezvt home 0
+dz softlowerlim 0
+dz softupperlim 1351
+dz home 0
 
 ############################
 # Motor Controller 3
@@ -338,27 +339,11 @@ dezvt home 0
 ############################
 #
 
-# Slit 1, upper
-Motor ss1u DMC2280 [params \
-  host $dmc2280_controller3(host)\
-  port $dmc2280_controller3(port)\
-  axis A\
-  units mm\
-  hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
-  hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
-  maxSpeed 1\
-  maxAccel 1\
-  maxDecel 1\
-  stepsPerX $slitStepRate]
-ss1u softlowerlim -25
-ss1u softupperlim 95
-ss1u home 0
-
 # Slit 1, lower
 Motor ss1d DMC2280 [params \
   host $dmc2280_controller3(host)\
   port $dmc2280_controller3(port)\
-  axis B\
+  axis A\
   units mm\
   hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
   hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
@@ -370,27 +355,27 @@ ss1d softlowerlim -25
 ss1d softupperlim 95
 ss1d home 0
 
-# Slit 1, right
-Motor ss1r DMC2280 [params \
+# Slit 1, upper
+Motor ss1u DMC2280 [params \
   host $dmc2280_controller3(host)\
   port $dmc2280_controller3(port)\
-  axis C\
+  axis B\
   units mm\
-  hardlowerlim [expr $horSlitHome - $horSlitLowRange]\
-  hardupperlim [expr $horSlitHome + $horSlitUpRange]\
+  hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
+  hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
   stepsPerX $slitStepRate]
-ss1r softlowerlim -25
-ss1r softupperlim 25
-ss1r home 0
+ss1u softlowerlim -25
+ss1u softupperlim 95
+ss1u home 0
 
 # Slit 1, left
 Motor ss1l DMC2280 [params \
   host $dmc2280_controller3(host)\
   port $dmc2280_controller3(port)\
-  axis D\
+  axis C\
   units mm\
   hardlowerlim [expr $horSlitHome - $horSlitLowRange]\
   hardupperlim [expr $horSlitHome + $horSlitUpRange]\
@@ -402,27 +387,27 @@ ss1l softlowerlim -25
 ss1l softupperlim 25
 ss1l home 0
 
-# Slit 2, upper
-Motor ss2u DMC2280 [params \
+# Slit 1, right
+Motor ss1r DMC2280 [params \
   host $dmc2280_controller3(host)\
   port $dmc2280_controller3(port)\
-  axis E\
+  axis D\
   units mm\
-  hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
-  hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
+  hardlowerlim [expr $horSlitHome - $horSlitLowRange]\
+  hardupperlim [expr $horSlitHome + $horSlitUpRange]\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
   stepsPerX $slitStepRate]
-ss2u softlowerlim -25
-ss2u softupperlim 95
-ss2u home 0
+ss1r softlowerlim -25
+ss1r softupperlim 25
+ss1r home 0
 
 # Slit 2, lower
 Motor ss2d DMC2280 [params \
   host $dmc2280_controller3(host)\
   port $dmc2280_controller3(port)\
-  axis F\
+  axis E\
   units mm\
   hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
   hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
@@ -434,27 +419,27 @@ ss2d softlowerlim -25
 ss2d softupperlim 95
 ss2d home 0
 
-# Slit 2, right
-Motor ss2r DMC2280 [params \
+# Slit 2, upper
+Motor ss2u DMC2280 [params \
   host $dmc2280_controller3(host)\
   port $dmc2280_controller3(port)\
-  axis G\
+  axis F\
   units mm\
-  hardlowerlim [expr $horSlitHome - $horSlitLowRange]\
-  hardupperlim [expr $horSlitHome + $horSlitUpRange]\
+  hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
+  hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
   stepsPerX $slitStepRate]
-ss2r softlowerlim -25
-ss2r softupperlim 25
-ss2r home 0
+ss2u softlowerlim -25
+ss2u softupperlim 95
+ss2u home 0
 
 # Slit 2, left
 Motor ss2l DMC2280 [params \
   host $dmc2280_controller3(host)\
   port $dmc2280_controller3(port)\
-  axis H\
+  axis G\
   units mm\
   hardlowerlim [expr $horSlitHome - $horSlitLowRange]\
   hardupperlim [expr $horSlitHome + $horSlitUpRange]\
@@ -466,27 +451,27 @@ ss2l softlowerlim -25
 ss2l softupperlim 25
 ss2l home 0
 
-# Slit 3, upper
-Motor ss3u DMC2280 [params \
-  host $dmc2280_controller4(host)\
-  port $dmc2280_controller4(port)\
-  axis A\
+# Slit 2, right
+Motor ss2r DMC2280 [params \
+  host $dmc2280_controller3(host)\
+  port $dmc2280_controller3(port)\
+  axis H\
   units mm\
-  hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
-  hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
+  hardlowerlim [expr $horSlitHome - $horSlitLowRange]\
+  hardupperlim [expr $horSlitHome + $horSlitUpRange]\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
   stepsPerX $slitStepRate]
-ss3u softlowerlim -25
-ss3u softupperlim 95
-ss3u home 0
+ss2r softlowerlim -25
+ss2r softupperlim 25
+ss2r home 0
 
 # Slit 3, lower
 Motor ss3d DMC2280 [params \
   host $dmc2280_controller4(host)\
   port $dmc2280_controller4(port)\
-  axis B\
+  axis A\
   units mm\
   hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
   hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
@@ -498,27 +483,27 @@ ss3d softlowerlim -25
 ss3d softupperlim 95
 ss3d home 0
 
-# Slit 3, right
-Motor ss3r DMC2280 [params \
+# Slit 3, upper
+Motor ss3u DMC2280 [params \
   host $dmc2280_controller4(host)\
   port $dmc2280_controller4(port)\
-  axis C\
+  axis B\
   units mm\
-  hardlowerlim [expr $horSlitHome - $horSlitLowRange]\
-  hardupperlim [expr $horSlitHome + $horSlitUpRange]\
+  hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
+  hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
   stepsPerX $slitStepRate]
-ss3r softlowerlim -25
-ss3r softupperlim 25
-ss3r home 0
+ss3u softlowerlim -25
+ss3u softupperlim 95
+ss3u home 0
 
 # Slit 3, Left
 Motor ss3l DMC2280 [params \
   host $dmc2280_controller4(host)\
   port $dmc2280_controller4(port)\
-  axis D\
+  axis C\
   units mm\
   hardlowerlim [expr $horSlitHome - $horSlitLowRange]\
   hardupperlim [expr $horSlitHome + $horSlitUpRange]\
@@ -530,27 +515,27 @@ ss3l softlowerlim -25
 ss3l softupperlim 25
 ss3l home 0
 
-# Slit 4, upper
-Motor ss4u DMC2280 [params \
+# Slit 3, right
+Motor ss3r DMC2280 [params \
   host $dmc2280_controller4(host)\
   port $dmc2280_controller4(port)\
-  axis E\
+  axis D\
   units mm\
-  hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
-  hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
+  hardlowerlim [expr $horSlitHome - $horSlitLowRange]\
+  hardupperlim [expr $horSlitHome + $horSlitUpRange]\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
   stepsPerX $slitStepRate]
-ss4u softlowerlim -25
-ss4u softupperlim 95
-ss4u home 0
+ss3r softlowerlim -25
+ss3r softupperlim 25
+ss3r home 0
 
 # Slit 4, lower
 Motor ss4d DMC2280 [params \
   host $dmc2280_controller4(host)\
   port $dmc2280_controller4(port)\
-  axis F\
+  axis E\
   units mm\
   hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
   hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
@@ -562,8 +547,24 @@ ss4d softlowerlim -25
 ss4d softupperlim 95
 ss4d home 0
 
-# Slit 4, right
-Motor ss4r DMC2280 [params \
+# Slit 4, upper
+Motor ss4u DMC2280 [params \
+  host $dmc2280_controller4(host)\
+  port $dmc2280_controller4(port)\
+  axis F\
+  units mm\
+  hardlowerlim [expr $vertSlitHome - $vertSlitLowRange]\
+  hardupperlim [expr $vertSlitHome + $vertSlitUpRange]\
+  maxSpeed 1\
+  maxAccel 1\
+  maxDecel 1\
+  stepsPerX $slitStepRate]
+ss4u softlowerlim -25
+ss4u softupperlim 95
+ss4u home 0
+
+# Slit 4, left
+Motor ss4l DMC2280 [params \
   host $dmc2280_controller4(host)\
   port $dmc2280_controller4(port)\
   axis G\
@@ -574,12 +575,12 @@ Motor ss4r DMC2280 [params \
   maxAccel 1\
   maxDecel 1\
   stepsPerX $slitStepRate]
-ss4r softlowerlim -25
-ss4r softupperlim 25
-ss4r home 0
+ss4l softlowerlim -25
+ss4l softupperlim 25
+ss4l home 0
 
-# Slit 4, left
-Motor ss4l DMC2280 [params \
+# Slit 4, right
+Motor ss4r DMC2280 [params \
   host $dmc2280_controller4(host)\
   port $dmc2280_controller4(port)\
   axis H\
@@ -590,9 +591,9 @@ Motor ss4l DMC2280 [params \
   maxAccel 1\
   maxDecel 1\
   stepsPerX $slitStepRate]
-ss4l softlowerlim -25
-ss4l softupperlim 25
-ss4l home 0
+ss4r softlowerlim -25
+ss4r softupperlim 25
+ss4r home 0
 
 ## Polarization Analyzer Vertical Translation, Z
 #Motor anzvt DMC2280 [params \