fixed the duplicates i think...