Edited for search functionality