Made AMD compliant