Updated with BeautifulSoup