Updated new graph setup