merged gfx2 and gfx3 again