Make every unique (part 2)