add Marco change. Change starts for List to Set (remove duplication)