Sped up the search by a lot by being smarter