rearranging for AMD and require support