optimize imports; add gfx