Original version with net calc bug
Merging v1-with-bug to deploy