fixed bug
using sets instead of lists to avoid duplicates
Merge remote-tracking branch 'origin/amsterdamDemo'