Added logic to make sure no duplicates show up