Added more preemption to recover states