changed search functions