Small Update that improves searching