restrusturing
Removed duplicates