More searching added