working on fixing duplicate names issuei