gfx update
merged