First commit for conversion to AMD