Finished :: Redo Graphics