removed duplicates
fixed duplicates