Better undo after x-es