made graph work properly for user
merge conflict