Some graph
Some design changes