Added logic to prevent theme from printing out duplicates