Updated undo for multiple uses