Reorganized and got rid of duplicates