Reimplimented crawler logic