Client side re-do, 20140910-2