Improve autokilling feature