updating to AMD structure