Small changes for graphic