Added the search and fixing some part