add search function
complete merge