Updated to new W3C recommandations