Search more function and commented out functions not currently being used