cd: integrate new gfx code