added search
adde dsearch
fixed merge conflicts