Move away from RepHtml some more