added rerun and only_add