Changed scraping method