Graph and Helpers Updated