updated w/ graphs