Added graphic functionality