rework graph loading