Modified original dedup for new class.