added search , not complete yet