upgrade automoveto, shuffling. persist/undying triggers ETB