working on current search code