Updated for new searching capabilities