diff --git a/site_ansto/instrument/hrpd/hipadaba_configuration.tcl b/site_ansto/instrument/hrpd/hipadaba_configuration.tcl
index f042f7df..ebcc9119 100644
--- a/site_ansto/instrument/hrpd/hipadaba_configuration.tcl
+++ b/site_ansto/instrument/hrpd/hipadaba_configuration.tcl
@@ -1,45 +1,45 @@
-# $Revision: 1.1 $
-# $Date: 2006-11-06 22:06:23 $
+# $Revision: 1.2 $
+# $Date: 2006-11-14 03:08:30 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
-# Last revision by: $Author: ffr $
+# Last revision by: $Author: dcl $
 
-hmake /sample spy none
-hmake /monochromator spy none
-hmake /slits spy none
-hmake /slits/1 spy none
-hmake /slits/2 spy none
-hmake /detector spy none
+# Defines hashes which map motor names to arrays
+source hpaths.tcl
 
-makeHdbMotor /slits/1 ss1u ss1u
-makeHdbMotor /slits/1 ss1d ss1d
-makeHdbMotor /slits/1 ss1l ss1l
-makeHdbMotor /slits/1 ss1r ss1r
-makeHdbVirtMotor /slits/1 ss1vg ss1vg
-makeHdbVirtMotor /slits/1 ss1vo ss1vo
-makeHdbVirtMotor /slits/1 ss1hg ss1hg
-makeHdbVirtMotor /slits/1 ss1ho ss1ho
+#TODO What we really want are duplicates of the SICS Motor and 
+# MakeConfigurableMotor commands which 
+foreach hp $hpaths { hmake $hp spy none }
 
-makeHdbMotor /slits/2 ss2u ss2u
-makeHdbMotor /slits/2 ss2d ss2d
-makeHdbMotor /slits/2 ss2l ss2l
-makeHdbMotor /slits/2 ss2r ss2r
-makeHdbVirtMotor /slits/2 ss2vg ss2vg
-makeHdbVirtMotor /slits/2 ss2vo ss2vo
-makeHdbVirtMotor /slits/2 ss2hg ss2hg
-makeHdbVirtMotor /slits/2 ss2ho ss2ho
+makeHdbMotor $motor_hpath(ss1u) ss1u ss1u
+makeHdbMotor $motor_hpath(ss1d) ss1d ss1d
+makeHdbMotor $motor_hpath(ss1l) ss1l ss1l
+makeHdbMotor $motor_hpath(ss1r) ss1r ss1r
+makeHdbVirtMotor $motor_hpath(ss1vg) ss1vg ss1vg
+makeHdbVirtMotor $motor_hpath(ss1vo) ss1vo ss1vo
+makeHdbVirtMotor $motor_hpath(ss1hg) ss1hg ss1hg
+makeHdbVirtMotor $motor_hpath(ss1ho) ss1ho ss1ho
 
-makeHdbMotor /sample som som
-makeHdbMotor /sample schi schi
-makeHdbMotor /sample sphi sphi
-makeHdbMotor /sample sx sx
-makeHdbMotor /sample sz sz
-makeHdbMotor /sample stth stth
+makeHdbMotor $motor_hpath(ss2u) ss2u ss2u
+makeHdbMotor $motor_hpath(ss2d) ss2d ss2d
+makeHdbMotor $motor_hpath(ss2l) ss2l ss2l
+makeHdbMotor $motor_hpath(ss2r) ss2r ss2r
+makeHdbVirtMotor $motor_hpath(ss2vg) ss2vg ss2vg
+makeHdbVirtMotor $motor_hpath(ss2vo) ss2vo ss2vo
+makeHdbVirtMotor $motor_hpath(ss2hg) ss2hg ss2hg
+makeHdbVirtMotor $motor_hpath(ss2ho) ss2ho ss2ho
 
-makeHdbMotor /monochromator mom mom
-makeHdbMotor /monochromator mchi mchi
-makeHdbMotor /monochromator mphi mphi
-makeHdbMotor /monochromator mx mx
-makeHdbMotor /monochromator mz mz
-makeHdbMotor /monochromator mtth mtth
+makeHdbMotor $motor_hpath(som) som som
+makeHdbMotor $motor_hpath(schi) schi schi
+makeHdbMotor $motor_hpath(sphi) sphi sphi
+makeHdbMotor $motor_hpath(sx) sx sx
+makeHdbMotor $motor_hpath(sz) sz sz
+makeHdbMotor $motor_hpath(stth) stth stth
 
-makeHdbHM /detector hm hm
+makeHdbMotor $motor_hpath(mom) mom mom
+makeHdbMotor $motor_hpath(mchi) mchi mchi
+makeHdbMotor $motor_hpath(mphi) mphi mphi
+makeHdbMotor $motor_hpath(mx) mx mx
+makeHdbMotor $motor_hpath(mz) mz mz
+makeHdbMotor $motor_hpath(mtth) mtth mtth
+
+makeHdbHM $motor_hpath(hm) hm hm