Update 99 to include search functions