Trying to enhance graph
(but is not enought for kevin :/ )