merging changes from various files
Got rid of duplicates