diff --git a/ptypy/engines/ML.py b/ptypy/engines/ML.py
index 9d5bb7d1a..aff77fa3c 100644
--- a/ptypy/engines/ML.py
+++ b/ptypy/engines/ML.py
@@ -106,6 +106,22 @@ class ML(PositionCorrectionEngine):
     help = How many coefficients to be used in the the linesearch
     doc = choose between the 'quadratic' approximation (default) or 'all'
 
+    [lipschitz_precond]
+    default = False
+    type = bool
+    help = Whether to use the Lipschitz preconditioner
+    doc = This parameter can give faster convergence.
+
+    [lipschitz_delta_object]
+    default = 0.1
+    type = float
+    help = Lipschitz preconditioner damping constant for the object.
+
+    [lipschitz_delta_probe]
+    default = 0.1
+    type = float
+    help = Lipschitz preconditioner damping constant for the probe.
+
     """
 
     SUPPORTED_MODELS = [Full, Vanilla, Bragg3dModel, BlockVanilla, BlockFull, GradFull, BlockGradFull]
@@ -137,6 +153,10 @@ def __init__(self, ptycho_parent, pars=None):
         # Probe gradient
         self.pr_grad_new = None
 
+        # Object and probe normalisation
+        if self.p.lipschitz_precond:
+            self.ob_nrm = None
+            self.pr_nrm = None
 
         # Other
         self.tmin = None
@@ -172,6 +192,11 @@ def engine_initialize(self):
         self.pr_grad_new = self.pr.copy(self.pr.ID + '_grad_new', fill=0.)
         self.pr_h = self.pr.copy(self.pr.ID + '_h', fill=0.)
 
+        # Object and probe normalisation
+        if self.p.lipschitz_precond:
+            self.ob_nrm = self.ob.copy(self.ob.ID + '_nrm', fill=0., dtype='real')
+            self.pr_nrm = self.pr.copy(self.pr.ID + '_nrm', fill=0., dtype='real')
+
         self.tmin = 1.
 
         # Other options
@@ -290,6 +315,13 @@ def engine_iterate(self, num=1):
             self.pr_grad *= self.scale_p_o
             self.pr_h -= self.pr_grad
 
+            # Lipschitz preconditioner
+            if self.p.lipschitz_precond:
+                self.ob_nrm += self.p.lipschitz_delta_object
+                self.ob_h /= self.ob_nrm
+                self.pr_nrm += self.p.lipschitz_delta_probe
+                self.pr_h /= self.pr_nrm
+
             # In principle, the way things are now programmed this part
             # could be iterated over in a real Newton-Raphson style.
             t2 = time.time()
@@ -353,6 +385,11 @@ def engine_finalize(self):
         del self.pr_grad_new
         del self.ptycho.containers[self.pr_h.ID]
         del self.pr_h
+        if self.p.lipschitz_precond:
+            del self.ptycho.containers[self.ob_nrm.ID]
+            del self.ob_nrm
+            del self.ptycho.containers[self.pr_nrm.ID]
+            del self.pr_nrm
 
         # Save floating intensities into runtime
         self.ptycho.runtime["float_intens"] = parallel.gather_dict(self.ML_model.float_intens_coeff)
@@ -377,6 +414,9 @@ def __init__(self, MLengine):
         self.ob = self.engine.ob
         self.ob_grad = self.engine.ob_grad_new
         self.pr_grad = self.engine.pr_grad_new
+        if self.p.lipschitz_precond:
+            self.ob_nrm = self.engine.ob_nrm
+            self.pr_nrm = self.engine.pr_nrm
         self.pr = self.engine.pr
         self.float_intens_coeff = {}
 
@@ -490,6 +530,9 @@ def new_grad(self):
         """
         self.ob_grad.fill(0.)
         self.pr_grad.fill(0.)
+        if self.p.lipschitz_precond:
+            self.ob_nrm.fill(0.)
+            self.pr_nrm.fill(0.)
 
         # We need an array for MPI
         LL = np.array([0.])
@@ -531,6 +574,11 @@ def new_grad(self):
                 self.ob_grad[pod.ob_view] += 2. * xi * pod.probe.conj()
                 self.pr_grad[pod.pr_view] += 2. * xi * pod.object.conj()
 
+                # Compute normalisations for object and probe
+                if self.p.lipschitz_precond:
+                    self.ob_nrm[pod.ob_view] += u.abs2(pod.probe)
+                    self.pr_nrm[pod.pr_view] += u.abs2(pod.object)
+
             diff_view.error = LLL
             error_dct[dname] = np.array([0, LLL / np.prod(DI.shape), 0])
             LL += LLL
@@ -538,6 +586,9 @@ def new_grad(self):
         # MPI reduction of gradients
         self.ob_grad.allreduce()
         self.pr_grad.allreduce()
+        if self.p.lipschitz_precond:
+            self.ob_nrm.allreduce()
+            self.pr_nrm.allreduce()
         parallel.allreduce(LL)
 
         # Object regularizer
@@ -733,6 +784,9 @@ def new_grad(self):
         """
         self.ob_grad.fill(0.)
         self.pr_grad.fill(0.)
+        if self.p.lipschitz_precond:
+            self.ob_nrm.fill(0.)
+            self.pr_nrm.fill(0.)
 
         # We need an array for MPI
         LL = np.array([0.])
@@ -774,6 +828,11 @@ def new_grad(self):
                 self.ob_grad[pod.ob_view] += 2 * xi * pod.probe.conj()
                 self.pr_grad[pod.pr_view] += 2 * xi * pod.object.conj()
 
+                # Compute normalisations for object and probe
+                if self.p.lipschitz_precond:
+                    self.ob_nrm[pod.ob_view] += u.abs2(pod.probe)
+                    self.pr_nrm[pod.pr_view] += u.abs2(pod.object)
+
             diff_view.error = LLL
             error_dct[dname] = np.array([0, LLL / np.prod(DI.shape), 0])
             LL += LLL
@@ -781,6 +840,9 @@ def new_grad(self):
         # MPI reduction of gradients
         self.ob_grad.allreduce()
         self.pr_grad.allreduce()
+        if self.p.lipschitz_precond:
+            self.ob_nrm.allreduce()
+            self.pr_nrm.allreduce()
         parallel.allreduce(LL)
 
         # Object regularizer
@@ -989,6 +1051,9 @@ def new_grad(self):
         """
         self.ob_grad.fill(0.)
         self.pr_grad.fill(0.)
+        if self.p.lipschitz_precond:
+            self.ob_nrm.fill(0.)
+            self.pr_nrm.fill(0.)
 
         # We need an array for MPI
         LL = np.array([0.])
@@ -1030,6 +1095,11 @@ def new_grad(self):
                 self.ob_grad[pod.ob_view] += 2. * xi * pod.probe.conj()
                 self.pr_grad[pod.pr_view] += 2. * xi * pod.object.conj()
 
+                # Compute normalisations for object and probe
+                if self.p.lipschitz_precond:
+                    self.ob_nrm[pod.ob_view] += u.abs2(pod.probe)
+                    self.pr_nrm[pod.pr_view] += u.abs2(pod.object)
+
             diff_view.error = LLL
             error_dct[dname] = np.array([0, LLL / np.prod(DA.shape), 0])
             LL += LLL
@@ -1037,6 +1107,9 @@ def new_grad(self):
         # MPI reduction of gradients
         self.ob_grad.allreduce()
         self.pr_grad.allreduce()
+        if self.p.lipschitz_precond:
+            self.ob_nrm.allreduce()
+            self.pr_nrm.allreduce()
         parallel.allreduce(LL)
 
         # Object regularizer