Added rerunning support.