SATP Scraping improved