Updated with html tags