Improved Crawler