diff --git a/xoptics/dcm.py b/xoptics/dcm.py
index 41b91b1..78916bf 100755
--- a/xoptics/dcm.py
+++ b/xoptics/dcm.py
@@ -18,10 +18,10 @@ class Double_Crystal_Mono:
      self.moving = PV(Id+':MOVING')
      self._stop = PV(Id +':STOP.PROC')
 
-    def move_and_wait(self,value,checktime=.01):
+    def move_and_wait(self,value,checktime=.01,precision=.5):
         self.energy_sp.put(value)
         #sleep(.1)
-        while not self.moving:
+        while not abs(self.get_current_value()-value)>precision:
             sleep(checktime)
 
     def changeTo(self,value):