Crawler now caters for different cases