Update on Pnl calculation