Modified the search system