added search and check