mods for new update + reweight