Updated gfx and some copy changes