duplication issues solved