Upgraded to latest gfx_graphics