Better Graph Setup

Forgot to update references.