I did some modifications (the search part)