update initial graph computation to take into account rig structure. #2