Update with Marian's version
Fix graph outputs