Add graph
Remove bad code from graph