Updated for the html service