Much improve on graphic!!