Updated with html parsing
Updated with html parsing