added self-delete option