improved rerun option