Revise life-cycle rid of restarted-status