Further work and html version