Last version with graphs