Made further changes to support AMD
Merge branch 'AMDing' into develop