Major updated to the graphs maker