Updated handykit to be AMD compliant