Updated HTML Parser