Updated Graphic stuff