Changed crawling logic