Upgraded to latest Piston + Gfx