Removed unnecessary includes and switched to new graph view