Added more graph stuff