Ported over new changes from the html markup