More work for the html version.