added scraping code, new handlers