Rewrite ad hoc again
Add html output