WIP fixing graphs