Updated calculations
Reorg
Reorg