Adding to calculate part of stat-net and no real changes to geom-net