Updated for html 5