Changes made after W3Compliance test