Initial inclusion of code by Uri Blass (unmerged)
try using Uri's diff as a condition for moving immediately