Added search funcion