changes for html5 support