Updated kamikaze logic