Revert "Revert "-- GFX Updates""

This reverts commit 10547841469f4da693bbeccf0332bba658438fcd.