Updated for AMD