More update.
Improve code.
Adding more searches.