Bring no_re_add up to date