Fixing bug in net calc
Moving to v2