added search almost done