Improved how it finds the new site.