diff --git a/site_ansto/instrument/config/scan/scan_common_1.tcl b/site_ansto/instrument/config/scan/scan_common_1.tcl
index 1b64471d..9325942a 100644
--- a/site_ansto/instrument/config/scan/scan_common_1.tcl
+++ b/site_ansto/instrument/config/scan/scan_common_1.tcl
@@ -1,5 +1,9 @@
 #TODO Define bmon and hmm scan commands in separate namespaces
 
+MakeScanCommand hmscan bm $cfPath(scan)/scan_common_1.hdd recover.bin
+MakeScanCommand bmonscan bm $cfPath(scan)/scan_common_1.hdd recover.bin
+MakeScanCommand scan2 bm $cfPath(scan)/scan_common_1.hdd recover.bin
+
 namespace eval scancommand {
 # List of counts
 variable bmoncounts_array
@@ -107,7 +111,7 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
 
 #TODO Feedback for Histogram memory scan
   proc hmm_writepoint {sobj uobj pt} {
-    write_nxentry addnxscanentry $pt;
+    write_nxentry hmm_addnxscanentry $pt;
   }
 
   proc donothing {args} {}
@@ -262,7 +266,6 @@ publish ::scancommand::bm_scan_finish user
 publish ::scancommand::bm_writepoint user
 publish ::scancommand::bm_count user
 
-MakeScanCommand bmonscan bm $cfPath(scan)/scan_common_1.hdd recover.bin
 bmonscan configure script
 bmonscan function writeheader ::scancommand::donothing
 bmonscan function writepoint ::scancommand::bm_writepoint
@@ -280,14 +283,20 @@ bmonscan function finish ::scancommand::bm_scan_finish
 # are properly defined. 
 # A different count callback is defined in the two cases.
 #
-MakeScanCommand hmscan bm $cfPath(scan)/scan_common_1.hdd recover.bin
-hmscan configure script
-#hmscan function prepare hs_prepare
-MakeScanCommand scan2 bm $cfPath(scan)/scan_common_1.hdd recover.bin
 scan2 configure script
+
+#hmscan function count  ::histogram_memory::hs_count_bm_controlled
+#hmscan function collect  ::histogram_memory::hs_collect
+#hmscan function finish  ::histogram_memory::hs_finish
+#
+#scan2 function prepare hs_prepare
+scan2 function count  ::histogram_memory::hs_count_hs_controlled
+#scan2 function collect  ::histogram_memory::hs_collect
+scan2 function finish  ::histogram_memory::hs_finish
 #
 # That's all, folks...
 
+hmscan configure script
 #hmscan function prepare hdbprepare
 #hmscan function collect hdbcollect
 hmscan function writeheader ::scancommand::donothing