Added search and shuffle