Merged in the HTML UI