Made Changes for searching