Final zombies commit