Conformance Update

Thanks @Sebmaster