dedupe and upgrade
looking meh