Added graphic and more