Better look ahead with undo