Added toggling to automatic destruction