Updates code to be fully WC3 compliant