Restore amd

Restore AMD and simplify architechture.