Delegating a few more htmlcodes and rebasing production