added the html from the 2 branches