Added search
fixed conflict