Added Grid and Search method