Rebasing crawling code