Added graphics, no refactor