Second pass, adds in uniqueness