Add full rerun-ability.