still working on duplication issue