Modified to include HTML stucture