diff --git a/src/py/bbctrl/Mach.py b/src/py/bbctrl/Mach.py
index 2aee1ef..f66cd93 100644
--- a/src/py/bbctrl/Mach.py
+++ b/src/py/bbctrl/Mach.py
@@ -275,6 +275,7 @@ class Mach(Comm):
 
     def home(self, axis, position = None):
         state = self.ctrl.state
+        config = self.ctrl.config
 
         if axis is None: axes = 'zxyabc' # TODO This should be configurable
         else: axes = '%c' % axis
@@ -312,6 +313,10 @@ class Mach(Comm):
 
             self.planner.mdi(gcode, False)
             super().resume()
+            if 'offset_' + axis in config.values:
+                self.log.info('Set the state value from config: {} = {}'.format('offset_' + axis , config.values['offset_' + axis]))
+            else:
+                self.log.info('Values is not present in config:{}'.format('offset_' + axis))
 
 
     def unhome(self, axis): self.mdi('G28.2 %c0' % axis)
diff --git a/src/py/bbctrl/Pwr.py b/src/py/bbctrl/Pwr.py
index 35690b4..9c4579a 100644
--- a/src/py/bbctrl/Pwr.py
+++ b/src/py/bbctrl/Pwr.py
@@ -161,7 +161,6 @@ class Pwr():
                 else: value /= 100.0
 
                 key = reg_names[i]
-                self.log.info('164 pwr: {}:{}'.format(key,value))
                 self.ctrl.state.set(key, value)
 
                 if self.regs[i] != value:
diff --git a/src/py/bbctrl/State.py b/src/py/bbctrl/State.py
index 0b1470a..dbae072 100644
--- a/src/py/bbctrl/State.py
+++ b/src/py/bbctrl/State.py
@@ -233,10 +233,11 @@ class State(object):
         keys = ['xp', 'yp', 'zp', 'offset_x', 'offset_y', 'offset_z']
         
         if name in keys and 'cycle' in self.vars:
-            self.log.info('236 sanjay cycle: %s'%self.vars['cycle'])
+            self.log.info('236 cycle:{} name:{} value:{}'.format(self.vars['cycle'], name, value))
             if self.vars['cycle'] == 'mdi':
-                self.log.info('238 changing data %s : %d , %d' % (name,value,self.vars[name]))
-                # self.ctrl.config.set('axes',{name: value})
+                self.log.info('238 changing data %s : %d , %d' % (name, value, self.vars[name]))
+                self.ctrl.config.set('axes', {name: value})
+
 
         if not name in self.vars or self.vars[name] != value:
             self.vars[name] = value