Changed the Set to a HashSet