refac of duplicates