Add #22
Add #23, using HashSet.