working on it
merge
Fixed searching