Updated for HTML5 compliance