Revised respawn mechanism