added proper search