diff --git a/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl b/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl
index 96b8439c..8bc7612e 100644
--- a/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl
+++ b/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl
@@ -32,22 +32,24 @@ set instrument_dictionary [subst {
     datatype @none
     property {data true control true nxsave false klass NXinstrument type instrument}
   }
-  instrument/parameters {
-    privilege spy
-    sobj {@any parameter}
-    datatype @none
-    property {data true control true nxsave true klass parameters type part}
-  }
   instrument/reduce {
     privilege spy
     sobj {@any reduce}
     datatype @none
     property {data true control true nxsave true klass reduce type part}
   }
-  instrument/parameters/parameters_group {
+  instrument/reduce/parameters {
     privilege spy
+    sobj {@any parameter}
     datatype @none
-    property {data true control false nxsave false klass @none type nxvgroup nxalias parameters_group}
+    property {data true control true nxsave true klass parameters type part}
+  }
+  instrument/reduce/parameters/parameters_group {
+    privilege spy
+    sobj {@any parameters_group}
+    datatype @nonei
+    #property {data true control false nxsave false klass @none type nxvgroup nxalias parameters_group}
+    property {data true control false nxsave false klass @none type part nxalias parameters_group}
   }
   instrument/aperture {
     privilege spy
diff --git a/site_ansto/instrument/lyrebird/config/commands/commands.tcl b/site_ansto/instrument/lyrebird/config/commands/commands.tcl
index f6a0a1cc..0ff539b0 100644
--- a/site_ansto/instrument/lyrebird/config/commands/commands.tcl
+++ b/site_ansto/instrument/lyrebird/config/commands/commands.tcl
@@ -140,29 +140,30 @@ proc selbs {bs {bx "UNDEF"} {bz "UNDEF"}} {
   }
 }
 publish selbs user
-namespace eval beamstops {
-  command selbsn {int=1,2,3,4,5,6 bs} {
-    selbs $bs "UNDEF" "UNDEF"
-  }
-  command selbsxz {int=1,2,3,4,5,6 bs float bx float bz} {
-    selbs $bs $bx $bz
-  }
-}
 
-namespace eval optics {
-	VarMake ::optics::select::section text user
-	VarMake ::optics::polarizer::in   text user
-	VarMake ::optics::lens::selection text user
+#namespace eval beamstops {
+# command selbsn {int=1,2,3,4,5,6 bs} {
+#   selbs $bs "UNDEF" "UNDEF"
+# }
+# command selbsxz {int=1,2,3,4,5,6 bs float bx float bz} {
+#   selbs $bs $bx $bz
+# }
+#}
+
+#namespace eval optics {
+#	VarMake ::optics::select::section text user
+#	VarMake ::optics::polarizer::in   text user
+#	VarMake ::optics::lens::selection text user
 	
-  command rotary_attenuator {int=0,15,45,90,180 angle} {
-    drive att $angle
-  }
+#  command rotary_attenuator {int=0,15,45,90,180 angle} {
+#    drive att $angle
+#  }
 
-  command entrance_aperture {
-    int=0,45,90,135,180,270 angle
-  } {
-    drive srce $angle
-  }
+#  command entrance_aperture {
+#    int=0,45,90,135,180,270 angle
+#  } {
+#    drive srce $angle
+#  }
 
 # TODO Do we need this
 # command sample_aperture {
@@ -181,35 +182,35 @@ namespace eval optics {
 #
 # eg\n
 # guide ga 
-  command guide "
-  text=[join [array names ::optics::guide_configuration] , ] configuration
-  " {
-
-    variable guide_configuration
-    variable guide_configuration_columns
-
-    if [ catch {
-
-      foreach {compselection position} $guide_configuration($configuration) {
-        foreach el $compselection guide $guide_configuration_columns {
-          lappend to_config $guide
-          lappend to_config [set ::optics::${guide}_map($el)] 
-        }
-        ::optics::guide -set feedback status BUSY
-        set msg [eval "drive $to_config"]
-        EApPosY $position
-      }
-      GuideConfig $configuration
-    } message ] {
-      ::optics::guide -set feedback status IDLE
-      if {$::errorCode=="NONE"} {return $message}
-      return -code error $message
-    }
-    ::optics::guide -set feedback status IDLE
-  }
-  ::optics::guide -addfb text status
-  ::optics::guide -set feedback status IDLE
-}
+#  command guide "
+#  text=[join [array names ::optics::guide_configuration] , ] configuration
+#  " {
+#
+#    variable guide_configuration
+#    variable guide_configuration_columns
+#
+#    if [ catch {
+#
+#      foreach {compselection position} $guide_configuration($configuration) {
+#        foreach el $compselection guide $guide_configuration_columns {
+#          lappend to_config $guide
+#          lappend to_config [set ::optics::${guide}_map($el)] 
+#        }
+#        ::optics::guide -set feedback status BUSY
+#        set msg [eval "drive $to_config"]
+#        EApPosY $position
+#      }
+#      GuideConfig $configuration
+#    } message ] {
+#      ::optics::guide -set feedback status IDLE
+#      if {$::errorCode=="NONE"} {return $message}
+#      return -code error $message
+#    }
+#    ::optics::guide -set feedback status IDLE
+#  }
+#  ::optics::guide -addfb text status
+#  ::optics::guide -set feedback status IDLE
+#}
 
 proc ::commands::isc_initialize {} {
   ::commands::ic_initialize
diff --git a/site_ansto/instrument/lyrebird/config/motors/motor_configuration.tcl b/site_ansto/instrument/lyrebird/config/motors/motor_configuration.tcl
index d5c772d8..7a0e8c0e 100644
--- a/site_ansto/instrument/lyrebird/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/lyrebird/config/motors/motor_configuration.tcl
@@ -1,12 +1,12 @@
 # Author: Jing Chen (jgn@ansto.gov.au)
 
 # START MOTOR CONFIGURATION
-::utility::mkVar FastShutter text manager FastShutter false instrument true false
+#::utility::mkVar FastShutter text manager FastShutter false instrument true false
 
 # SET TO 1 TO USE THE TILT STAGE ie sample phi and chi
 set use_tiltstage 0
 
-set animal lyrebird
+set animal taipan
 set sim_mode [SplitReply [motor_simulation]]
 
 # Setup addresses of Galil DMC2280 controllers.
@@ -158,8 +158,8 @@ set move_count 100
 # Dummy translation motor, useful for testing scans
 Motor dummy_motor asim [params \
   asyncqueue mc1\
-  host mc1-lyrebird\
-  port pmc1-lyrebird\
+  host mc1-taipan\
+  port pmc1-taipan\
   axis C\
   units mm\
   hardlowerlim -500\
@@ -181,8 +181,8 @@ if $use_tiltstage {
 # Sample tilt along beam [-20,+20] degrees
 Motor samchi $motor_driver_type [params \
   asyncqueue mc1\
-  host mc1-lyrebird\
-  port pmc1-lyrebird\
+  host mc1-taipan\
+  port pmc1-taipan\
   axis A\
   units degrees\
   hardlowerlim -20\
@@ -203,8 +203,8 @@ samchi home 0
 # Sample tilt across beam [-20,+20] degrees
 Motor samphi $motor_driver_type [params \
   asyncqueue mc1\
-  host mc1-lyrebird\
-  port pmc1-lyrebird\
+  host mc1-taipan\
+  port pmc1-taipan\
   axis B\
   units degrees\
   hardlowerlim -20\
@@ -225,8 +225,8 @@ samphi home 0
 # Sample translation across beam [0,1000] mm
 Motor samx $motor_driver_type [params \
   asyncqueue mc1\
-  host mc1-lyrebird\
-  port pmc1-lyrebird\
+  host mc1-taipan\
+  port pmc1-taipan\
   axis C\
   units mm\
   hardlowerlim -500\
@@ -247,8 +247,8 @@ samx home 0
 # Sample translation along beam [0,1000] mm
 Motor samy $motor_driver_type [params \
   asyncqueue mc1\
-  host mc1-lyrebird\
-  port pmc1-lyrebird\
+  host mc1-taipan\
+  port pmc1-taipan\
   axis D\
   units mm\
   hardlowerlim 0\
@@ -270,8 +270,8 @@ samy speed 5
 # Sample translation vertical [0,500] mm
 Motor samz $motor_driver_type [params \
   asyncqueue mc1\
-  host mc1-lyrebird\
-  port pmc1-lyrebird\
+  host mc1-taipan\
+  port pmc1-taipan\
   axis E\
   units mm\
   hardlowerlim 0\
@@ -292,8 +292,8 @@ samz home 0
 # Sample rotation (theta) [0,180] degrees
 Motor samthet $motor_driver_type [params \
   asyncqueue mc1\
-  host mc1-lyrebird\
-  port pmc1-lyrebird\
+  host mc1-taipan\
+  port pmc1-taipan\
   axis F\
   units degrees\
   hardlowerlim -30\
@@ -324,8 +324,8 @@ set det_CntsPerX [expr 8192.0/377.0]
 # Detector translation along beam [0,20000] mm
 Motor det $motor_driver_type [params \
   asyncqueue mc1\
-  host mc1-lyrebird\
-  port pmc1-lyrebird\
+  host mc1-taipan\
+  port pmc1-taipan\
   action MC1\
   axis G\
   units mm\
@@ -351,8 +351,8 @@ det Blockage_Fail 0
 # Looks like an non-metric screw pitch 0.2 inches / turn
 Motor detoff $motor_driver_type [params \
   asyncqueue mc1\
-  host mc1-lyrebird\
-  port pmc1-lyrebird\
+  host mc1-taipan\
+  port pmc1-taipan\
   axis H\
   units mm\
   hardlowerlim -9\
@@ -381,8 +381,8 @@ detoff home 0
 # Collimation motor 1
 Motor pc1 $motor_driver_type [params \
   asyncqueue mc2\
-  host mc2-lyrebird\
-  port pmc2-lyrebird\
+  host mc2-taipan\
+  port pmc2-taipan\
   axis A\
   units mm\
   hardlowerlim -295\
@@ -395,20 +395,20 @@ Motor pc1 $motor_driver_type [params \
   absEncHome $pc1_Home\
   cntsPerX $coll_CntsPerX\
   posit_count 3]
-pc1 posit_1 [expr $pc1_Guide]
-pc1 posit_2 [expr $pc1_Empty]
-pc1 posit_3 [expr $pc1_Polarizer]
-pc1 part collimator
-pc1 long_name pc1
-setHomeandRange -motor pc1 -home 0 -lowrange 295 -uprange 95
-pc1 speed 6
-pc1 creep_offset 1
+#pc1 posit_1 [expr $pc1_Guide]
+#pc1 posit_2 [expr $pc1_Empty]
+#pc1 posit_3 [expr $pc1_Polarizer]
+#pc1 part collimator
+#pc1 long_name pc1
+#setHomeandRange -motor pc1 -home 0 -lowrange 295 -uprange 95
+#pc1 speed 6
+#pc1 creep_offset 1
 
 # Collimation motor 2
 Motor pc2 $motor_driver_type [params \
   asyncqueue mc2\
-  host mc2-lyrebird\
-  port pmc2-lyrebird\
+  host mc2-taipan\
+  port pmc2-taipan\
   axis B\
   units mm\
   hardlowerlim -295\
@@ -421,20 +421,20 @@ Motor pc2 $motor_driver_type [params \
   absEncHome $pc2_Home\
   cntsPerX $coll_CntsPerX\
   posit_count 3]
-pc2 posit_1 [expr $pc2_Guide]
-pc2 posit_2 [expr $pc2_Empty]
-pc2 posit_3 [expr $pc2_Polarizer]
-pc2 part collimator
-pc2 long_name pc2
-setHomeandRange -motor pc2 -home 0 -lowrange 295 -uprange 95
-pc2 speed 6
-pc2 creep_offset 1
+#pc2 posit_1 [expr $pc2_Guide]
+#pc2 posit_2 [expr $pc2_Empty]
+#pc2 posit_3 [expr $pc2_Polarizer]
+#pc2 part collimator
+#pc2 long_name pc2
+#setHomeandRange -motor pc2 -home 0 -lowrange 295 -uprange 95
+#pc2 speed 6
+#pc2 creep_offset 1
 
 # Collimation motor 3
 Motor pc3 $motor_driver_type [params \
   asyncqueue mc2\
-  host mc2-lyrebird\
-  port pmc2-lyrebird\
+  host mc2-taipan\
+  port pmc2-taipan\
   axis C\
   units mm\
   hardlowerlim -190\
@@ -447,20 +447,20 @@ Motor pc3 $motor_driver_type [params \
   absEncHome $pc3_Home\
   cntsPerX $coll_CntsPerX\
   posit_count 3]
-pc3 posit_1 [expr $pc3_Empty]
-pc3 posit_2 [expr $pc3_Guide]
-pc3 posit_3 [expr $pc3_Aperture]
-pc3 part collimator
-pc3 long_name pc3
-setHomeandRange -motor pc3 -home 0 -lowrange 190 -uprange 190
-pc3 speed 6
-pc3 creep_offset 1
+#pc3 posit_1 [expr $pc3_Empty]
+#pc3 posit_2 [expr $pc3_Guide]
+#pc3 posit_3 [expr $pc3_Aperture]
+#pc3 part collimator
+#pc3 long_name pc3
+#setHomeandRange -motor pc3 -home 0 -lowrange 190 -uprange 190
+#pc3 speed 6
+#pc3 creep_offset 1
 
 # Collimation motor 4
 Motor pc4 $motor_driver_type [params \
   asyncqueue mc2\
-  host mc2-lyrebird\
-  port pmc2-lyrebird\
+  host mc2-taipan\
+  port pmc2-taipan\
   axis D\
   units mm\
   hardlowerlim -190\
@@ -473,20 +473,20 @@ Motor pc4 $motor_driver_type [params \
   absEncHome $pc4_Home\
   cntsPerX $coll_CntsPerX\
   posit_count 3]
-pc4 posit_1 [expr $pc4_Empty]
-pc4 posit_2 [expr $pc4_Guide]
-pc4 posit_3 [expr $pc4_Aperture]
-pc4 part collimator
-pc4 long_name pc4
-setHomeandRange -motor pc4 -home 0 -lowrange 190 -uprange 190
-pc4 speed 6
-pc4 creep_offset 1
+#pc4 posit_1 [expr $pc4_Empty]
+#pc4 posit_2 [expr $pc4_Guide]
+#pc4 posit_3 [expr $pc4_Aperture]
+#pc4 part collimator
+#pc4 long_name pc4
+#setHomeandRange -motor pc4 -home 0 -lowrange 190 -uprange 190
+#pc4 speed 6
+#pc4 creep_offset 1
 
 # Collimation motor 5
 Motor pc5 $motor_driver_type [params \
   asyncqueue mc2\
-  host mc2-lyrebird\
-  port pmc2-lyrebird\
+  host mc2-taipan\
+  port pmc2-taipan\
   axis E\
   units mm\
   hardlowerlim -190\
@@ -499,20 +499,20 @@ Motor pc5 $motor_driver_type [params \
   absEncHome $pc5_Home\
   cntsPerX $coll_CntsPerX\
   posit_count 3]
-pc5 posit_1 [expr $pc5_Empty]
-pc5 posit_2 [expr $pc5_Guide]
-pc5 posit_3 [expr $pc5_Aperture]
-pc5 part collimator
-pc5 long_name pc5
-setHomeandRange -motor pc5 -home 0 -lowrange 190 -uprange 190
-pc5 speed 6
-pc5 creep_offset 1
+#pc5 posit_1 [expr $pc5_Empty]
+#pc5 posit_2 [expr $pc5_Guide]
+#pc5 posit_3 [expr $pc5_Aperture]
+#pc5 part collimator
+#pc5 long_name pc5
+#setHomeandRange -motor pc5 -home 0 -lowrange 190 -uprange 190
+#pc5 speed 6
+#pc5 creep_offset 1
 
 # Collimation motor 6
 Motor pc6 $motor_driver_type [params \
   asyncqueue mc2\
-  host mc2-lyrebird\
-  port pmc2-lyrebird\
+  host mc2-taipan\
+  port pmc2-taipan\
   axis F\
   units mm\
   hardlowerlim -190\
@@ -525,20 +525,20 @@ Motor pc6 $motor_driver_type [params \
   absEncHome $pc6_Home\
   cntsPerX $coll_CntsPerX\
   posit_count 3]
-pc6 posit_1 [expr $pc6_Empty]
-pc6 posit_2 [expr $pc6_Guide]
-pc6 posit_3 [expr $pc6_Aperture]
-pc6 part collimator
-pc6 long_name pc6
-setHomeandRange -motor pc6 -home 0 -lowrange 190 -uprange 190
-pc6 speed 6
-pc6 creep_offset 1
+#pc6 posit_1 [expr $pc6_Empty]
+#pc6 posit_2 [expr $pc6_Guide]
+#pc6 posit_3 [expr $pc6_Aperture]
+#pc6 part collimator
+#pc6 long_name pc6
+#setHomeandRange -motor pc6 -home 0 -lowrange 190 -uprange 190
+#pc6 speed 6
+#pc6 creep_offset 1
 
 # Collimation motor 7
 Motor pc7 $motor_driver_type [params \
   asyncqueue mc2\
-  host mc2-lyrebird\
-  port pmc2-lyrebird\
+  host mc2-taipan\
+  port pmc2-taipan\
   axis G\
   units mm\
   hardlowerlim -190\
@@ -551,20 +551,20 @@ Motor pc7 $motor_driver_type [params \
   absEncHome $pc7_Home\
   cntsPerX $coll_CntsPerX\
   posit_count 3]
-pc7 posit_1 [expr $pc7_Empty]
-pc7 posit_2 [expr $pc7_Guide]
-pc7 posit_3 [expr $pc7_Aperture]
-pc7 part collimator
-pc7 long_name pc7
-setHomeandRange -motor pc7 -home 0 -lowrange 190 -uprange 190
-pc7 speed 6
-pc7 creep_offset 1
+#pc7 posit_1 [expr $pc7_Empty]
+#pc7 posit_2 [expr $pc7_Guide]
+#pc7 posit_3 [expr $pc7_Aperture]
+#pc7 part collimator
+#pc7 long_name pc7
+#setHomeandRange -motor pc7 -home 0 -lowrange 190 -uprange 190
+#pc7 speed 6
+#pc7 creep_offset 1
 
 # Collimation motor 8
 Motor pc8 $motor_driver_type [params \
   asyncqueue mc2\
-  host mc2-lyrebird\
-  port pmc2-lyrebird\
+  host mc2-taipan\
+  port pmc2-taipan\
   axis H\
   units mm\
   hardlowerlim -190\
@@ -577,14 +577,14 @@ Motor pc8 $motor_driver_type [params \
   absEncHome $pc8_Home\
   cntsPerX $coll_CntsPerX\
   posit_count 3]
-pc8 posit_1 [expr $pc8_Empty]
-pc8 posit_2 [expr $pc8_Guide]
-pc8 posit_3 [expr $pc8_Aperture]
-pc8 part collimator
-pc8 long_name pc8
-setHomeandRange -motor pc8 -home 0 -lowrange 190 -uprange 190
-pc8 speed 6
-pc8 creep_offset 1
+#pc8 posit_1 [expr $pc8_Empty]
+#pc8 posit_2 [expr $pc8_Guide]
+#pc8 posit_3 [expr $pc8_Aperture]
+#pc8 part collimator
+#pc8 long_name pc8
+#setHomeandRange -motor pc8 -home 0 -lowrange 190 -uprange 190
+#pc8 speed 6
+#pc8 creep_offset 1
 
 ############################
 # Motor Controller 3
@@ -596,8 +596,8 @@ pc8 creep_offset 1
 # Collimation motor 9
 Motor pc9 $motor_driver_type [params \
   asyncqueue mc3\
-  host mc3-lyrebird\
-  port pmc3-lyrebird\
+  host mc3-taipan\
+  port pmc3-taipan\
   axis A\
   units mm\
   hardlowerlim -190\
@@ -610,20 +610,20 @@ Motor pc9 $motor_driver_type [params \
   absEncHome $pc9_Home\
   cntsPerX $coll_CntsPerX\
   posit_count 3]
-pc9 posit_1 [expr $pc9_Empty]
-pc9 posit_2 [expr $pc9_Guide]
-pc9 posit_3 [expr $pc9_Aperture]
-pc9 part collimator
-pc9 long_name pc9
-setHomeandRange -motor pc9 -home 0 -lowrange 190 -uprange 190
-pc9 speed 6
-pc9 creep_offset 1
+#pc9 posit_1 [expr $pc9_Empty]
+#pc9 posit_2 [expr $pc9_Guide]
+#pc9 posit_3 [expr $pc9_Aperture]
+#pc9 part collimator
+#pc9 long_name pc9
+#setHomeandRange -motor pc9 -home 0 -lowrange 190 -uprange 190
+#pc9 speed 6
+#pc9 creep_offset 1
 
 # Collimation motor 10
 Motor pc10 $motor_driver_type [params \
   asyncqueue mc3\
-  host mc3-lyrebird\
-  port pmc3-lyrebird\
+  host mc3-taipan\
+  port pmc3-taipan\
   axis B\
   units mm\
   hardlowerlim -190\
@@ -636,22 +636,22 @@ Motor pc10 $motor_driver_type [params \
   absEncHome $pc10_Home\
   cntsPerX $coll_CntsPerX\
   posit_count 5]
-pc10 posit_1 [expr $pc10_Lens]
-pc10 posit_2 [expr $pc10_Empty]
-pc10 posit_3 [expr $pc10_Guide]
-pc10 posit_4 [expr $pc10_Aperture]
-pc10 posit_5 [expr $pc10_LensandPrism]
-pc10 part collimator
-pc10 long_name pc10
-setHomeandRange -motor pc10 -home 0 -lowrange 190 -uprange 190
-pc10 speed 6
-pc10 creep_offset 1
+#pc10 posit_1 [expr $pc10_Lens]
+#pc10 posit_2 [expr $pc10_Empty]
+#pc10 posit_3 [expr $pc10_Guide]
+#pc10 posit_4 [expr $pc10_Aperture]
+#pc10 posit_5 [expr $pc10_LensandPrism]
+#pc10 part collimator
+#pc10 long_name pc10
+#setHomeandRange -motor pc10 -home 0 -lowrange 190 -uprange 190
+#pc10 speed 6
+#pc10 creep_offset 1
 
 # Pentaprism
 Motor pent $motor_driver_type [params \
   asyncqueue mc3\
-  host mc3-lyrebird\
-  port pmc3-lyrebird\
+  host mc3-taipan\
+  port pmc3-taipan\
   axis C\
   units mm\
   hardlowerlim -30\
@@ -663,16 +663,16 @@ Motor pent $motor_driver_type [params \
   absEnc 1\
   absEncHome $pent_Home\
   cntsPerX [expr -8192.0/3.0]]
-pent part collimator
-pent long_name pent
-setHomeandRange -motor pent -home 0 -lowrange 30 -uprange 300
-pent speed 1
+#pent part collimator
+#pent long_name pent
+#setHomeandRange -motor pent -home 0 -lowrange 30 -uprange 300
+#pent speed 1
 
 # Rotary source aperture
 Motor srce $motor_driver_type [params \
   asyncqueue mc3\
-  host mc3-lyrebird\
-  port pmc3-lyrebird\
+  host mc3-taipan\
+  port pmc3-taipan\
   axis D\
   units degrees\
   hardlowerlim -10\
@@ -685,30 +685,30 @@ Motor srce $motor_driver_type [params \
   absEncHome $srce_Home\
   cntsPerX [expr -8192.0/6.0]\
   posit_count 12]
-srce part collimator
-srce long_name srce
-srce home 180
-srce softlowerlim -10
-srce softupperlim 340
-srce speed 1
-srce posit_1 $srce_Home
-srce posit_2 [expr $srce_Home - (1 * 5 * 8192)]
-srce posit_3 [expr $srce_Home - (2 * 5 * 8192)]
-srce posit_4 [expr $srce_Home - (3 * 5 * 8192)]
-srce posit_5 [expr $srce_Home - (4 * 5 * 8192)]
-srce posit_6 [expr $srce_Home - (5 * 5 * 8192)]
-srce posit_7 [expr $srce_Home - (6 * 5 * 8192)]
-srce posit_8 [expr $srce_Home - (7 * 5 * 8192)]
-srce posit_9 [expr $srce_Home - (8 * 5 * 8192)]
-srce posit_10 [expr $srce_Home - (9 * 5 * 8192)]
-srce posit_11 [expr $srce_Home - (10 * 5 * 8192)]
-srce posit_12 [expr $srce_Home - (11 * 5 * 8192)]
+#srce part collimator
+#srce long_name srce
+#srce home 180
+#srce softlowerlim -10
+#srce softupperlim 340
+#srce speed 1
+#srce posit_1 $srce_Home
+#srce posit_2 [expr $srce_Home - (1 * 5 * 8192)]
+#srce posit_3 [expr $srce_Home - (2 * 5 * 8192)]
+#srce posit_4 [expr $srce_Home - (3 * 5 * 8192)]
+#srce posit_5 [expr $srce_Home - (4 * 5 * 8192)]
+#srce posit_6 [expr $srce_Home - (5 * 5 * 8192)]
+#srce posit_7 [expr $srce_Home - (6 * 5 * 8192)]
+#srce posit_8 [expr $srce_Home - (7 * 5 * 8192)]
+#srce posit_9 [expr $srce_Home - (8 * 5 * 8192)]
+#srce posit_10 [expr $srce_Home - (9 * 5 * 8192)]
+#srce posit_11 [expr $srce_Home - (10 * 5 * 8192)]
+#srce posit_12 [expr $srce_Home - (11 * 5 * 8192)]
 
 # Sample aperture x
 Motor apx $motor_driver_type [params \
   asyncqueue mc3\
-  host mc3-lyrebird\
-  port pmc3-lyrebird\
+  host mc3-taipan\
+  port pmc3-taipan\
   axis E\
   units mm\
   hardlowerlim -260\
@@ -720,18 +720,18 @@ Motor apx $motor_driver_type [params \
   absEnc 1\
   absEncHome $apx_Home\
   cntsPerX -819.2]
-apx part collimator
-apx long_name apx
-apx home 0
-apx softlowerlim -255
-apx softupperlim 5
-apx speed 5
+#apx part collimator
+#apx long_name apx
+#apx home 0
+#apx softlowerlim -255
+#apx softupperlim 5
+#apx speed 5
 
 # Sample aperture y
 #Motor apz $motor_driver_type [params \
 #  asyncqueue mc3\
-#  host mc3-lyrebird\
-#  port pmc3-lyrebird\
+#  host mc3-taipan\
+#  port pmc3-taipan\
 #  axis F\
 #  units mm\
 #  hardlowerlim -10\
@@ -752,8 +752,8 @@ apx speed 5
 set att_factor [expr ((1.0 - (1.0)/360.0)*(3000.0/61.0))/360.0]
 Motor att $motor_driver_type [params \
   asyncqueue mc3\
-  host mc3-lyrebird\
-  port pmc3-lyrebird\
+  host mc3-taipan\
+  port pmc3-taipan\
   axis G\
   units degrees\
   hardlowerlim -30\
@@ -765,12 +765,12 @@ Motor att $motor_driver_type [params \
   absEnc 1\
   absEncHome $att_Home\
   cntsPerX [expr -($att_factor*8192.0)]]
-att part collimator
-att long_name att
-setHomeandRange -motor att -home 0 -lowrange 0 -uprange 7230
-att speed 5
+#att part collimator
+#att long_name att
+#setHomeandRange -motor att -home 0 -lowrange 0 -uprange 7230
+#att speed 5
 # 2009-12-15 Attenuator wheel was re-installed 120 degrees out of whack!!!!!!
-att home -120
+#att home -120
 
 ############################
 # Motor Controller 4
@@ -782,8 +782,8 @@ att home -120
 # beam stop horizontal [-100,300] mm
 Motor bsx $motor_driver_type [params \
   asyncqueue mc4\
-  host mc4-lyrebird\
-  port pmc4-lyrebird\
+  host mc4-taipan\
+  port pmc4-taipan\
   axis A\
   units mm\
   hardlowerlim 0\
@@ -795,18 +795,18 @@ Motor bsx $motor_driver_type [params \
   absEnc 1\
   absEncHome $bsx_Home\
   cntsPerX [expr 8192.0/5.0/1.02]]
-bsx part detector
-bsx long_name bsx
-bsx softlowerlim 0
-bsx softupperlim 310
-bsx speed 5
-bsx home 0
+#bsx part detector
+#bsx long_name bsx
+#bsx softlowerlim 0
+#bsx softupperlim 310
+#bsx speed 5
+#bsx home 0
 
 # beam stop vertical [-240,100] mm
 Motor bsz $motor_driver_type [params \
   asyncqueue mc4\
-  host mc4-lyrebird\
-  port pmc4-lyrebird\
+  host mc4-taipan\
+  port pmc4-taipan\
   axis B\
   units mm\
   hardlowerlim 0\
@@ -818,11 +818,11 @@ Motor bsz $motor_driver_type [params \
   absEnc 1\
   absEncHome $bsz_Home\
   cntsPerX [expr (8192.0*7.0)/5.0/1.02]]
-bsz part detector
-bsz long_name bsz
-bsz softlowerlim 0
-bsz softupperlim 275
-bsz home 0
+#bsz part detector
+#bsz long_name bsz
+#bsz softlowerlim 0
+#bsz softupperlim 275
+#bsz home 0
 
 # Largest beamstop
 Motor bs1 $motor_driver_type [params \
@@ -838,12 +838,12 @@ Motor bs1 $motor_driver_type [params \
   absEnc 1\
   absEncHome $bs1_Home\
   cntsPerX $bs_cntsPerX]
-bs1 part detector
-bs1 long_name bs1
-bs1 softlowerlim 11
-bs1 softupperlim 95
-bs1 home 90
-bs1 precision 0.05
+#bs1 part detector
+#bs1 long_name bs1
+#bs1 softlowerlim 11
+#bs1 softupperlim 95
+#bs1 home 90
+#bs1 precision 0.05
 
 Motor bs2 $motor_driver_type [params \
   asyncqueue mc4\
@@ -858,12 +858,12 @@ Motor bs2 $motor_driver_type [params \
   absEnc 1\
   absEncHome $bs2_Home\
   cntsPerX $bs_cntsPerX]
-bs2 part detector
-bs2 long_name bs2
-bs2 softlowerlim 7
-bs2 softupperlim 95
-bs2 home 90
-bs2 precision 0.05
+#bs2 part detector
+#bs2 long_name bs2
+#bs2 softlowerlim 7
+#bs2 softupperlim 95
+#bs2 home 90
+#bs2 precision 0.05
 
 Motor bs3 $motor_driver_type [params \
   asyncqueue mc4\
@@ -878,12 +878,12 @@ Motor bs3 $motor_driver_type [params \
   absEnc 1\
   absEncHome $bs3_Home\
   cntsPerX $bs_cntsPerX]
-bs3 part detector
-bs3 long_name bs3
-bs3 softlowerlim 11
-bs3 softupperlim 95
-bs3 home 90
-bs3 precision 0.05
+#bs3 part detector
+#bs3 long_name bs3
+#bs3 softlowerlim 11
+#bs3 softupperlim 95
+#bs3 home 90
+#bs3 precision 0.05
 
 Motor bs4 $motor_driver_type [params \
   asyncqueue mc4\
@@ -898,12 +898,12 @@ Motor bs4 $motor_driver_type [params \
   absEnc 1\
   absEncHome $bs4_Home\
   cntsPerX $bs_cntsPerX]
-bs4 part detector
-bs4 long_name bs4
-bs4 softlowerlim 7
-bs4 softupperlim 95
-bs4 home 90
-bs4 precision 0.05
+#bs4 part detector
+#bs4 long_name bs4
+#bs4 softlowerlim 7
+#bs4 softupperlim 95
+#bs4 home 90
+#bs4 precision 0.05
 
 Motor bs5 $motor_driver_type [params \
   asyncqueue mc4\
@@ -918,12 +918,12 @@ Motor bs5 $motor_driver_type [params \
   absEnc 1\
   absEncHome $bs5_Home\
   cntsPerX $bs_cntsPerX]
-bs5 part detector
-bs5 long_name bs5
-bs5 softlowerlim 11
-bs5 softupperlim 95
-bs5 home 90
-bs5 precision 0.05
+#bs5 part detector
+#bs5 long_name bs5
+#bs5 softlowerlim 11
+#bs5 softupperlim 95
+#bs5 home 90
+#bs5 precision 0.05
 
 Motor bs6 $motor_driver_type [params \
   asyncqueue mc4\
@@ -938,18 +938,18 @@ Motor bs6 $motor_driver_type [params \
   absEnc 1\
   absEncHome $bs6_Home\
   cntsPerX $bs_cntsPerX]
-bs6 part detector
-bs6 long_name bs6
-bs6 softlowerlim 7
-bs6 softupperlim 95
-bs6 home 90
-bs6 precision 0.05
+#bs6 part detector
+#bs6 long_name bs6
+#bs6 softlowerlim 7
+#bs6 softupperlim 95
+#bs6 home 90
+#bs6 precision 0.05
 
 # Polarizer Rotation
 #Motor pol $motor_driver_type [params \
 #  asyncqueue mc4\
-#  host mc4-lyrebird\
-#  port pmc4-lyrebird\
+#  host mc4-taipan\
+#  port pmc4-taipan\
 #  axis H\
 #  units degrees\
 #  hardlowerlim 0\
@@ -975,14 +975,14 @@ proc motor_set_sobj_attributes {} {
 # http://www.unidata.ucar.edu/software/udunits/udunits-1/udunits.txt
 # So we use "count" for dimensionless decimal numbers
 set vc_units count
-make_coll_motor_2 c1 section_1 pc1 pc2 $vc_units
-make_coll_motor_1 c2 section_2 pc3 $vc_units
-make_coll_motor_1 c3 section_3 pc4 $vc_units
-make_coll_motor_1 c4 section_4 pc5 $vc_units
-make_coll_motor_1 c5 section_5 pc6 $vc_units
-make_coll_motor_1 c6 section_6 pc7 $vc_units
-make_coll_motor_1 c7 section_7 pc8 $vc_units
-make_coll_motor_1 c8 section_8 pc9 $vc_units
-make_coll_motor_1 c9 section_9 pc10 $vc_units
+#make_coll_motor_2 c1 section_1 pc1 pc2 $vc_units
+#make_coll_motor_1 c2 section_2 pc3 $vc_units
+#make_coll_motor_1 c3 section_3 pc4 $vc_units
+#make_coll_motor_1 c4 section_4 pc5 $vc_units
+#make_coll_motor_1 c5 section_5 pc6 $vc_units
+#make_coll_motor_1 c6 section_6 pc7 $vc_units
+#make_coll_motor_1 c7 section_7 pc8 $vc_units
+#make_coll_motor_1 c8 section_8 pc9 $vc_units
+#make_coll_motor_1 c9 section_9 pc10 $vc_units
 unset vc_units
 
diff --git a/site_ansto/instrument/lyrebird/config/parameters/parameters.tcl b/site_ansto/instrument/lyrebird/config/parameters/parameters.tcl
index 1a55eb98..bbf47e36 100644
--- a/site_ansto/instrument/lyrebird/config/parameters/parameters.tcl
+++ b/site_ansto/instrument/lyrebird/config/parameters/parameters.tcl
@@ -112,7 +112,7 @@ namespace eval parameters {
 	set paramlist {
 		AttFactor
 		BSdiam
-    DetPosYOffset    
+                DetPosYOffset    
 		EApPosY
 		EApShape
 		EApX
@@ -121,8 +121,8 @@ namespace eval parameters {
 		L1
 		L2
 		Plex
-    SamYOffset 
-    Transmission 
+                SamYOffset 
+                Transmission 
 	}
 }
 ##
@@ -152,5 +152,6 @@ proc check {args} {
     }
   }
 }
+
 publish check user
 
diff --git a/site_ansto/instrument/lyrebird/config/velsel/velsel.tcl b/site_ansto/instrument/lyrebird/config/velsel/velsel.tcl
index 0683cc4b..cbfa536f 100644
--- a/site_ansto/instrument/lyrebird/config/velsel/velsel.tcl
+++ b/site_ansto/instrument/lyrebird/config/velsel/velsel.tcl
@@ -49,4 +49,4 @@ namespace eval ::scobj::velocity_selector {
   }
 }
 
-source $cfPath(velsel)/sct_velsel.tcl
+#source $cfPath(velsel)/sct_velsel.tcl
diff --git a/site_ansto/instrument/lyrebird/lyrebird_configuration.tcl b/site_ansto/instrument/lyrebird/lyrebird_configuration.tcl
index a6d556dd..e6f253bc 100644
--- a/site_ansto/instrument/lyrebird/lyrebird_configuration.tcl
+++ b/site_ansto/instrument/lyrebird/lyrebird_configuration.tcl
@@ -6,7 +6,7 @@ Instrument lyrebird
 Instrument lock
 
 #START SERVER CONFIGURATION SECTION
-source util/dmc2280/dmc2280_util.tcl
+#source util/dmc2280/dmc2280_util.tcl
 source sics_ports.tcl
 source server_config.tcl
 #END SERVER CONFIGURATION SECTION
@@ -20,10 +20,10 @@ fileeval $cfPath(motors)/motor_configuration.tcl
 fileeval $cfPath(source)/source.tcl
 source $cfPath(hipadaba)/hipadaba_configuration.tcl
 fileeval $cfPath(motors)/positmotor_configuration.tcl
-fileeval $cfPath(velsel)/velsel.tcl
-fileeval $cfPath(parameters)/parameters.tcl
+#fileeval $cfPath(velsel)/velsel.tcl
+#fileeval $cfPath(parameters)/parameters.tcl
 fileeval $cfPath(plc)/plc.tcl
-fileeval $cfPath(optics)/optics.tcl
+#fileeval $cfPath(optics)/optics.tcl
 fileeval $cfPath(counter)/counter.tcl
 #fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
 #fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
@@ -39,7 +39,7 @@ fileeval $cfPath(anticollider)/anticollider.tcl
 #fileeval $cfPath(environment)/environment.tcl
 #fileeval $cfPath(environment)/sct_mcr500_rheometer.tcl
 #fileeval $cfPath(environment)/sct_protek_common.tcl
-fileeval $cfPath(beamline)/spin_flipper.tcl
+#fileeval $cfPath(beamline)/spin_flipper.tcl
 source gumxml.tcl
 
 ::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false