Modifications for w3c.