Integrated Michael's latest html