updated search method
renamed method
renamed method
Merge branch 'dde_upgrade'